Merge branch 'card007' into order

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

@@ -202,9 +202,7 @@ public class TscNaverPayService {
 		params.add("taxExScopeAmount", "0");
 		params.add("doCompareRest", "1");
 		params.add("expectedRestAmount", String.valueOf(payment.getLeftAmt() - payment.getPayAmt()));
-log.info("leftAmt >>> {}", payment.getLeftAmt());
-		log.info("payAmt >>> {}", payment.getPayAmt());
-		log.info("expectedRestAmount >>> {}", params.get("expectedRestAmount"));
+
 		// 취소 요청자 설정
 		String cancelRequester = "2";
 		if (StringUtils.isNotBlank(payment.getCancelRequester())) {
@@ -220,13 +218,15 @@ log.info("leftAmt >>> {}", payment.getLeftAmt());
 
 		// 승인 성공일때 200
 		if (statusCode == 200 && "Success".equals(naverPay.getCode())) {
+			payment.setPgGb(TscConstants.PgGb.NAVER.value());
+			payment.setPayAmt(payment.getPayAmt() * -1);
 			payment.setNpayPntAmt(naverPay.getBody().getNpointCancelAmount() * -1);
 			payment.setPgTid(naverPay.getBody().getPaymentId());
 			payment.setPgTradeNo(naverPay.getBody().getPayHistId());
+			payment.setPgShopId(env.getProperty("naverPay.clientId"));
+			payment.setPgShopKey(env.getProperty("naverPay.clientSecret"));
 			payment.setCustNo(payment.getCustNo());
 			payment.setNaverMethodType(naverPay.getBody().getPrimaryPayMeans());
-			
-			
 			payment.setResCd(naverPay.getCode());
 			payment.setResMsg(naverPay.getMessage());
 

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

@@ -997,9 +997,10 @@ public class TscOrderChangeService {
 				// 3-1. 환불정보 설정
 				int spanRealCnclRtnAmt 		= obj.getRealOrdAmt();		// 취소금액합계
 				// int sumDeliveryFee 			= obj.getDelvFee();			// 배송비합계
-				int spanTotDeliveryFee 		= obj.getAddDelvFee();		// 추가배송비합계
+				// int spanTotDeliveryFee 		= obj.getAddDelvFee();		// 추가배송비합계 (추가배송비 처리는 환불컨펌에서 진행)
 				int spanTotRtnDelvFee 		= obj.getRtnDelvFee();		// 반품배송비합계
-				int addDelvFee				= spanTotDeliveryFee + spanTotRtnDelvFee;
+				// int addDelvFee				= spanTotDeliveryFee + spanTotRtnDelvFee; //  (추가배송비 처리는 환불컨펌에서 진행)
+				int addDelvFee				= spanTotRtnDelvFee;
 				int spanRefundAmt = spanRealCnclRtnAmt;
 
 				// 고객사유 : 환불금액계산 = 취소금액 - 추가배송비
@@ -1009,12 +1010,13 @@ public class TscOrderChangeService {
 						chgStat = TscConstants.OrderChangeStat.RETURN_WAIT.value();			// 추가배송비 처리 상태값 설정
 					} else {
 						spanRefundAmt = refundAmt;											// 추가배송비 제외 환불금액 설정
+						addDelvFee = 0;
 					}
 				}
 				// 회사사유 : 환불금액계산 = 취소금액
 				else {
 					// 추가배송비 0 처리
-					spanTotDeliveryFee = 0;
+					// spanTotDeliveryFee = 0;  // (추가배송비 처리는 환불컨펌에서 진행)
 					spanTotRtnDelvFee = 0;
 					addDelvFee = 0;
 				}
@@ -1057,14 +1059,14 @@ public class TscOrderChangeService {
 
 				orderChangeDao.createDeliveryFee(deliveryFee);
 
-				// 추가배송비 등록
-				if (spanTotDeliveryFee > 0) {
-					deliveryFee.setDelvFeeGb(TscConstants.DeliveryFeeGb.ORIGIN_DELIVERY_FEE.value());
-					deliveryFee.setDelvFee(spanTotDeliveryFee);
-					deliveryFee.setRealDelvAmt(spanTotDeliveryFee);
-
-					orderChangeDao.createDeliveryFee(deliveryFee);
-				}
+				// 추가배송비 등록 (추가배송비 처리는 환불컨펌에서 진행)
+				// if (spanTotDeliveryFee > 0) {
+				// 	deliveryFee.setDelvFeeGb(TscConstants.DeliveryFeeGb.ORIGIN_DELIVERY_FEE.value());
+				// 	deliveryFee.setDelvFee(spanTotDeliveryFee);
+				// 	deliveryFee.setRealDelvAmt(spanTotDeliveryFee);
+				//
+				// 	orderChangeDao.createDeliveryFee(deliveryFee);
+				// }
 
 				// 3-4. 주문상세정보 수정
 				ordChgSq = orderChange.getOrdChgSq();
@@ -1103,8 +1105,8 @@ public class TscOrderChangeService {
 				refundOrder.setRfPrePntAmt(obj.getPrePntDcAmt());
 				refundOrder.setRfGfcdUseAmt(obj.getGfcdAmt());
 				refundOrder.setRfCnclAmt(obj.getCnclRtnAmt());
-				refundOrder.setRfDeliveryFee(addDelvFee);
-				refundOrder.setRfRealCnclAmt(spanRefundAmt - addDelvFee);
+				refundOrder.setRfDeliveryFee(addDelvFee * -1);
+				refundOrder.setRfRealCnclAmt(spanRefundAmt + addDelvFee);
 				refundOrder.setRaNo(accountNo);
 				refundOrder.setRaNm(accountNm);
 				refundOrder.setRaBank(bankCd);

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

@@ -249,7 +249,6 @@ public class TscOrderRefundService {
 
 			// 취소금액이 있을때 처리
 			if (obj.getCnclRtnAmt() > 0) {
-			
 				// 4.1 무료배송비용 > (주문금액 - 취소금액)
 				if (obj.getMinOrdAmt() > leftOrdAmt) {
 					// 4.2 주문시 배송비가 존재하면 추가 배송비 없음

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

@@ -1649,7 +1649,7 @@
 		FROM   TB_CUST_POINT CP
 		WHERE  1=1
 		AND    CP.CUST_NO = #{custNo}
-		AND    CP.EXP_BE_DT <![CDATA[ < ]]> NOW()
+		AND    CP.EXP_BE_DT <![CDATA[ > ]]> NOW()
 		AND    CP.EXP_CMP_DT IS NULL
 	</select>
 	
@@ -1670,6 +1670,7 @@
 		  FROM TB_CUST_COUPON
 		 WHERE CUST_NO = #{custNo}
 		   AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT
+		   AND USED_DT IS NULL
 		<if test='expiredSoon == "Y"'>
 		   AND TIMESTAMPDIFF(SECOND, CURRENT_DATE, AVAIL_EDDT) BETWEEN 0 AND 604800
 		</if>