Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -379,7 +379,30 @@ public class TsaOrderChangeController extends TsaBaseController {
 		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호
 		
 		// 4. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-		orderChangeService.returnRequest(map);
+		GagaMap result = orderChangeService.returnRequest(map);
+		int ordChgSq = result.getInt("ordChgSq");
+
+		if (ordChgSq > 0) {
+			try {
+				// 반품 알림톡 관련 정보 조회
+				OrderChange orderChange = orderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+				
+				// 반품 알림톡 발송
+				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
+					coreKakaotalkService.sendOrderReturnRequest(orderChange, userNo);
+				}
+
+				// 반품 안내 메일 정보 조회
+				GagaMap replaceInfo = orderChangeService.getMailOrderReturnReplaceInfo(orderChange);
+
+				// 반품 안내 메일 발송
+				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+					coreMailService.sendOrderReturn(replaceInfo, userNo);
+				}
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
+		}
 		
 		return super.ok("성공");
 	}
@@ -602,6 +625,29 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 교환처리
 		result = orderChangeService.exchReq(excReq);
+		int ordChgSq = result.getInt("ordChgSq");
+
+		if (ordChgSq > 0) {
+			try {
+				// 교환 알림톡 관련 정보 조회
+				OrderChange orderChange = orderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+
+				// 교환 알림톡 발송
+				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
+					coreKakaotalkService.sendOrderExchangeRequest(orderChange, userNo);
+				}
+
+				// 교환 안내 메일 정보 조회
+				GagaMap replaceInfo = orderChangeService.getMailOrderExchangeReplaceInfo(orderChange);
+
+				// 교환 안내 메일 발송
+				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+					coreMailService.sendOrderExchange(replaceInfo, userNo);
+				}
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
+		}
 
 		// 처리 결과 코드에 따른 메세지 설정
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {

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

@@ -73,7 +73,7 @@
 		    , (SELECT BD.BRAND_KNM FROM TB_BRAND BD WHERE BD.BRAND_CD = Z.BRAND_CD ) AS BRAND_NM
 		    , FN_GET_CODE_NM('G056', Z.GOODS_TYPE ) AS GOODS_TYPE_NM 
 		    , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY S WHERE S.SUPPLY_COMP_CD = Z.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM 
-		    , IFNULL((SELECT SWT_TRC_SEND_YN FROM TB_ORDER_DETAIL_INVOICE V WHERE V.ORD_NO = Z.ORD_NO AND V.ORD_DTL_NO = Z.ORD_DTL_NO AND V.INVOICE_NO = Z.INVOICE_NO  ),'N') AS INVC_TRACKING 
+		    , IFNULL((SELECT  MAX(SWT_TRC_SEND_YN) FROM TB_ORDER_DETAIL_INVOICE V WHERE V.ORD_NO = Z.ORD_NO AND V.ORD_DTL_NO = Z.ORD_DTL_NO AND V.INVOICE_NO = Z.INVOICE_NO  ),'N') AS INVC_TRACKING 
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_NO DESC, A.ORD_DTL_NO) RNUM 
 		    FROM (