Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/core/biz/service/TscCustomerService.java

@@ -219,7 +219,8 @@ public class TscCustomerService {
 		// 1. 고객정보 이력 생성
 		customerDao.createCustomerHistory(customer);
 
-		// 2. 휴면해제처리
+		// 2. 휴면해제처리 - 등급 WELCOME 추가
+		customer.setCustGrade(TscConstants.CustGrade.WELCOME.value());
 		int resultCnt = customerDao.updateDormantCustomerRelease(customer);
 
 		// 3. 휴면 테이블 삭제

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -1288,7 +1288,7 @@ public class TscOrderService {
 			Order delvFeeCdObj = delvFeeCdList.get(i);
 			
 			// 배송정책별 무료배송비 체크
-			if (delvFeeCdObj.getSumOrdAmt() > delvFeeCdObj.getMinOrdAmt() ) {
+			if (delvFeeCdObj.getSumOrdAmt() >= delvFeeCdObj.getMinOrdAmt() ) {
 				delvFeeCdObj.setDelvFee(0);
 			} else {
 				delvFeeCdObj.setDelvFee(delvFeeCdObj.getDelvFee());

src/main/java/com/style24/persistence/mybatis/shop/TscCustomer.xml

@@ -438,6 +438,7 @@
 		     , C.CUST_STAT = 'G104_10'
 		     , C.RM_DORMANT_DT = NOW()
 		     , C.BIRTH_MM = DC.BIRTH_MM
+		     , C.CUST_GRADE = #{custGrade}
 		     , C.UPD_DT = NOW()
 		     , C.UPD_NO = #{updNo}
 		WHERE  C.CUST_NO = #{custNo}