카카오 취반교 알림톡 제휴몰 미발송 처리

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

@@ -10,6 +10,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.thirdparty.NaverShortUrl;
 import com.style24.core.biz.thirdparty.SsgKakaoSender;
@@ -29,8 +30,6 @@ import com.style24.persistence.domain.SsgDirectMessage;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-
 /**
  * 카카오알림톡 Service. 모든 카카오알림톡 발송은 여기에서 처리한다.
  * 
@@ -1591,7 +1590,9 @@ public class TscKakaotalkService {
 		payment.setOrdNo(order.getOrdNo());
 		payment = orderChangeDao.getPaymentInfo(payment);
 		// 네이버페이 주문형 데이터는 알림톡 송부X
-		if (TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
+		// 2021.09.10 card007 외부몰주문 추가
+		if (TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())
+			|| TscConstants.PayMeans.EXTMALL.value().equals(payment.getPayMeans())) {
 			return;
 		}
 

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

@@ -3589,14 +3589,14 @@
 	<select id="getKakaoOrderCancelInfo" parameterType="int" resultType="OrderChange">
 		/* TscOrderChange.getKakaoOrderCancelInfo */
 		SELECT Z.*
-		     , DATE_FORMAT(ADDDATE(Z.ORD_DT, INTERVAL 3 DAY), '%Y년 %m월 %d일')                     AS GIFT_PACK_CLOSE_DT
+		     , DATE_FORMAT(ADDDATE(Z.ORD_DT, INTERVAL 3 DAY), '%Y년 %m월 %d일')                    AS GIFT_PACK_CLOSE_DT
 		  FROM (SELECT O.ORD_NO
 		             , OC.ORD_CHG_SQ
 		             , OC.CHG_REASON
 		             , O.ORD_NM
 		             , O.ORD_PHNNO
 		             , O.MALL_GB
-		             , (R.REFUND_AMT + R.RF_GFCD_USE_AMT + R.RF_DELV_GFCD_USE_AMT + R.RF_PNT_AMT) AS REFUND_AMT
+		             , R.REFUND_AMT                                                               AS REFUND_AMT
 		             , G.GOODS_NM
 		             , P.PAY_MEANS
 		             , FN_GET_CODE_NM('G014', P.PAY_MEANS)                                        AS PAY_MEANS_NM
@@ -3616,6 +3616,7 @@
 		            ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 		         INNER JOIN TB_ORDER O
 		            ON O.ORD_NO = OD.ORD_NO
+		           AND O.MALL_GB = 'G011_10'
 		         INNER JOIN TB_REFUND R
 		            ON OC.ORD_CHG_SQ = R.ORD_CHG_SQ
 		         INNER JOIN TB_PAYMENT P
@@ -3658,6 +3659,7 @@
 		            ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 		         INNER JOIN TB_ORDER O
 		            ON O.ORD_NO = OD.ORD_NO
+		           AND O.MALL_GB = 'G011_10'
 		         INNER JOIN TB_GOODS G
 		            ON OD.GOODS_CD = G.GOODS_CD
 		          LEFT OUTER JOIN TB_PAYMENT P