Merge branch 'card007' into develop

src/main/java/com/style24/core/biz/dao/TscOrderDao.java

@@ -920,4 +920,14 @@ public interface TscOrderDao {
 	 * @since 2021. 06. 17
 	 */
 	Collection<Order> getSweetTrackerDeliveryInfo(Order order);
+
+	/**
+	 * 추가배송비 결제금액 환불배송비 수정 처리
+	 * 
+	 * @param Payment
+	 * @return int
+	 * @author card007
+	 * @since 2021. 06. 18
+	 */
+	int updateRefundDeliveryFee(Payment payment);
 }

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

@@ -606,8 +606,11 @@ public class TscKakaotalkService {
 		}
 		
 		// 테스트중
-		if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
-			kakaoSender.send(kakaoAnswerSq, dm, replaceInfo);
+		String active = env.getProperty("spring.profiles.active");
+		if (!"run".equals(active) && !"style".equals(active)) {
+			if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
+				kakaoSender.send(kakaoAnswerSq, dm, replaceInfo);
+			}
 		}
 		
 		try {
@@ -747,8 +750,11 @@ public class TscKakaotalkService {
 		replaceInfo.setString("giftPackCloseDt"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(giftPackCloseDt));
 		
 		// 테스트중
-		if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
-			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.GIFT_ARRIVED.value(), dm, replaceInfo);
+		String active = env.getProperty("spring.profiles.active");
+		if (!"run".equals(active) && !"style".equals(active)) {
+			if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
+				kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.GIFT_ARRIVED.value(), dm, replaceInfo);
+			}
 		}
 		
 		try {
@@ -1023,7 +1029,8 @@ public class TscKakaotalkService {
 			}
 		}
 
-		if (ansSq > 0) {
+		String active = env.getProperty("spring.profiles.active");
+		if (ansSq > 0 && !"run".equals(active) && !"style".equals(active)) {
 			// 테스트중
 			if ("전석훈".equals(orderChange.getOrdNm()) || "이태영".equals(orderChange.getOrdNm()) || "김지철".equals(orderChange.getOrdNm()) || "신주승".equals(orderChange.getOrdNm()) || "송대근".equals(orderChange.getOrdNm())) {
 				kakaoSender.send(ansSq, dm, replaceInfo);
@@ -1095,7 +1102,8 @@ public class TscKakaotalkService {
 		replaceInfo.setString("chgerBaseAddr"		, chgerBaseAddr);
 		replaceInfo.setInt("addPayCost"				, addPayCost);
 
-		if (ansSq > 0) {
+		String active = env.getProperty("spring.profiles.active");
+		if (ansSq > 0 && !"run".equals(active) && !"style".equals(active)) {
 			// 테스트중
 			if ("전석훈".equals(orderChange.getOrdNm()) || "이태영".equals(orderChange.getOrdNm()) || "김지철".equals(orderChange.getOrdNm()) || "신주승".equals(orderChange.getOrdNm()) || "송대근".equals(orderChange.getOrdNm())) {
 				SsgDirectMessage dm = new SsgDirectMessage();
@@ -1173,7 +1181,8 @@ public class TscKakaotalkService {
 		replaceInfo.setString("chgerBaseAddr"		, chgerBaseAddr);
 		replaceInfo.setInt("addPayCost"				, addPayCost);
 
-		if (ansSq > 0) {
+		String active = env.getProperty("spring.profiles.active");
+		if (ansSq > 0 && !"run".equals(active) && !"style".equals(active)) {
 			// 테스트중
 			if ("전석훈".equals(orderChange.getOrdNm()) || "이태영".equals(orderChange.getOrdNm()) || "김지철".equals(orderChange.getOrdNm()) || "신주승".equals(orderChange.getOrdNm()) || "송대근".equals(orderChange.getOrdNm())) {
 				SsgDirectMessage dm = new SsgDirectMessage();

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

@@ -2874,8 +2874,19 @@ public class TscOrderService {
 	public void updateDeliveryFeePaySq(Payment payment) {
 		orderDao.updateDeliveryFeePaySq(payment);
 	}
-	
-	
+
+	/**
+	 * 추가배송비 결제금액 환불배송비 수정 처리
+	 *
+	 * @param Payment
+	 * @return int
+	 * @author card007
+	 * @since 2021. 06. 18
+	 */
+	@Transactional("shopTxnManager")
+	public int updateRefundDeliveryFee(Payment payment) {
+		return orderDao.updateRefundDeliveryFee(payment);
+	}
 }
 
 

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

@@ -4376,4 +4376,12 @@
 		   AND INVOICE_NO = #{invoiceNo}
 		 ORDER BY DELV_LEVEL DESC
 	</select>
+	
+	<!-- 추가배송비 결제금액 환불배송비 수정 처리 -->
+	<update id="updateRefundDeliveryFee" parameterType="payment">
+		/* TscOrder.updateRefundDeliveryFee */
+		UPDATE TB_REFUND
+		   SET RF_DELIVERY_FEE = RF_DELIVERY_FEE - #{payAmt}
+		 WHERE ORD_CHG_SQ = #{ordChgSq}
+	</update>
 </mapper>

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

@@ -3031,7 +3031,8 @@
 		                  , SUM(DELV_CPN_DC_AMT) AS DELV_CPN_DC_AMT
 		                  , SUM(REAL_DELV_AMT) AS REAL_DELV_AMT
 		               FROM TB_DELIVERY_FEE
-		              WHERE DELV_FEE_GB = 'G018_10'
+		              WHERE ORD_NO = #{ordNo}
+		                AND DELV_FEE_GB = 'G018_10'
 		              GROUP BY ORD_NO) DF
 		    ON OD.ORD_NO = DF.ORD_NO
 		 WHERE OD.ORD_NO = #{ordNo}