Merge branch 'develop' into card007

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

@@ -147,6 +147,7 @@ public class TscDeliveryService {
 					order.setExtmallNm(info.getExtmallNm());
 					order.setMallGb(info.getMallGb());
 					order.setExtmallTell(info.getExtmallTell());
+					order.setCnclsmsSendYn(info.getCnclsmsSendYn());
 					kakaotalkService.sendSoldoutCancel(order, userNo);
 				}catch(Exception e) {
 					log.debug("kakaotalkService Exception ordChgSq:"+cancelInfo.getInt("ordChgSq"));

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

@@ -1649,12 +1649,14 @@ public class TscKakaotalkService {
 		if (TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
 			return;
 		}
-
+		// 제휴몰일경우  제휴몰에서 발송인 제휴몰건은 제외
+		if (TscConstants.MallGb.EXTMALL.value().equals(order.getMallGb()) && "Y".equals(order.getCnclsmsSendYn())) {
+			return;
+		}
+		
 		SsgDirectMessage dm = new SsgDirectMessage();
 		dm.setFuserid(String.valueOf(senderNo)); // 발송자NO
 		dm.setFdestine(order.getOrdPhnno());
-		//dm.setFdestine("01040161558");
-		//order.setOrdNm("문달호");
 
 		dm.setFkkoresendtype("LMS");
 
@@ -1702,10 +1704,8 @@ public class TscKakaotalkService {
 		if (TscConstants.MallGb.EXTMALL.value().equals(order.getMallGb())) {
 			if ("Y".equals(order.getCancelAllYn())) {
 				ansSq = SsgKakaoSender.KakaoAnswerSq.EXTMALL_SOLDOUT.value();
-				//	ansSq=1040;
 			} else {
 				ansSq = SsgKakaoSender.KakaoAnswerSq.EXTMALL_PART_SOLDOUT.value();
-				//ansSq=1041;
 			}
 		}
 
@@ -1765,7 +1765,6 @@ public class TscKakaotalkService {
 
 		SsgDirectMessage dm = new SsgDirectMessage();
 		dm.setFuserid(String.valueOf(senderNo)); // 발송자NO
-		//dm.setFdestine("01040161558");
 		dm.setFdestine(order.getOrdPhnno());
 		dm.setFkkoresendtype("LMS");
 

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

@@ -54,6 +54,7 @@
 			, CASE WHEN MAX((SELECT SUM(OD.ORD_QTY - OD.CNCL_RTN_QTY) FROM TB_ORDER_DETAIL OD WHERE OD.ORD_NO = C.ORD_NO)) = 0 THEN 'Y' ELSE 'N' END  AS CANCEL_ALL_YN
 			, MAX((SELECT M.EXTMALL_NM FROM TB_EXTMALL M WHERE M.VENDOR_ID = C.VENDOR_ID AND M.EXTMALL_ID = C.EXTMALL_ID)) AS EXTMALL_NM
 			, MAX((SELECT M.EXTMALL_TEL FROM TB_EXTMALL M WHERE M.VENDOR_ID = C.VENDOR_ID AND M.EXTMALL_ID = C.EXTMALL_ID)) AS EXTMALL_TEL
+			, MAX((SELECT M.CNCLSMS_SEND_YN FROM TB_EXTMALL M WHERE M.VENDOR_ID = C.VENDOR_ID AND M.EXTMALL_ID = C.EXTMALL_ID)) AS CNCLSMS_SEND_YN
 			, D.MALL_GB
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ