Merge branch 'develop' into style

src/main/java/com/style24/scm/biz/service/TssBusinessService.java

@@ -78,7 +78,8 @@ public class TssBusinessService {
 			delvFeePolicy.setUpdNo(TssSession.getInfo().getUserNo());
 
 			if (!StringUtils.isEmpty(delvFeePolicy.getDelvFeeCd())) {
-				businessDao.updateDeliveryFeePolicy(delvFeePolicy);
+				/* 배송비 정책 이슈로 인해 업체에서 데이타 업데이트 하지 못하도록 수정 */
+				/* businessDao.updateDeliveryFeePolicy(delvFeePolicy); */
 			} else {
 				businessDao.createDeliveryFeePolicy(delvFeePolicy);
 			}

src/main/java/com/style24/scm/biz/web/TssBusinessController.java

@@ -2,6 +2,7 @@ package com.style24.scm.biz.web;
 
 import java.util.Collection;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -183,9 +184,17 @@ public class TssBusinessController extends TssBaseController {
 		if (delvFeePolicyList == null || delvFeePolicyList.isEmpty()) {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
+		
+		boolean updateChk=false; 
+		
+		for (DelvFeePolicy delvFeePolicy : delvFeePolicyList) {
+			if (!StringUtils.isEmpty(delvFeePolicy.getDelvFeeCd())) {
+				updateChk=true;
+			}
+		}
 
 		businessService.saveDeliveryFeePolicyList(delvFeePolicyList);
-		return super.ok(message.getMessage("SUCC_0001"));
+		return updateChk? super.ok("신규 배송비 정책은 저장 되나, 기존 베송비 정책은 업데이트 할 수 없습니다."):  super.ok(message.getMessage("SUCC_0001"));
 	}
 
 	/**