주문 취반교 오류 수정 임시 커밋

src/main/java/com/style24/admin/biz/service/TsaWithdrawService.java

@@ -470,23 +470,6 @@ public class TsaWithdrawService {
 				orderChangeService.partialRefund(info, userNo);
 			}
 
-			// 반품완료 알림톡
-			
-			Withdraw refundOrdchgSq = new Withdraw();
-			refundOrdchgSq.setOrdChgSq(ordChgSq);
-			Withdraw refundInfo = withdrawDao.getRefundInfo(refundOrdchgSq);
-			
-			Order order = new Order();
-			order.setOrdNo(refundInfo.getOrdNo());
-			order.setCustNo(refundInfo.getCustNo());
-			order.setOrdNm(refundInfo.getOrdNm());
-			order.setOrdPhnno(refundInfo.getOrdPhnno());
-			order.setRefundAmt(refundInfo.getRefundAmt());
-			order.setGoodsCnt(refundInfo.getGoodsCnt()+"");
-			order.setGoodsNm(refundInfo.getGoodsNm());
-			
-			kakaotalkService.sendRefundComplete(order, userNo);
-			
 			// 네이버페이 환불컨펌
 			if(TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				// PG 미전송이 아닐 경우 (Y면 미전송, N이면 전송)
@@ -570,5 +553,9 @@ public class TsaWithdrawService {
 		}
 
 	}
+	
+	public Withdraw getRefundInfo(Withdraw withdraw) {
+		return withdrawDao.getRefundInfo(withdraw);
+	}
 
 }

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

@@ -19,10 +19,12 @@ import com.style24.admin.biz.service.TsaWithdrawService;
 import com.style24.admin.biz.service.TsaWmsWithdrawService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.session.TscSession;
 import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Withdraw;
 import com.style24.persistence.domain.WithdrawExc;
@@ -59,9 +61,10 @@ public class TsaWithdrawController extends TsaBaseController {
 	private TsaWmsWithdrawService wmsWithdrawService;
 	
 	@Autowired
-	private TscOrderChangeService orderChangeService;	
-	
-	
+	private TscOrderChangeService orderChangeService;
+
+	@Autowired
+	private TscKakaotalkService kakaotalkService;
 
 	
 	/**
@@ -178,13 +181,35 @@ public class TsaWithdrawController extends TsaBaseController {
 	@ResponseBody
 	public GagaResponse refundDetailConfirm(@RequestBody GagaMap orderChange) {
 		log.info("orderChange {}"+orderChange);
+		
+		int userNo = TsaSession.getInfo().getUserNo();
 
 		// 환불 컨펌 처리자 설정
-		orderChange.setInt("userNo", TsaSession.getInfo().getUserNo());
+		orderChange.setInt("userNo", userNo);
 
 		// 환불컨펌 처리
 		withdrawService.refundDetailConfirm(orderChange);
 
+		// 반품완료 알림톡
+		Withdraw refundOrdchgSq = new Withdraw();
+		refundOrdchgSq.setOrdChgSq(orderChange.getInt("ordChgSq"));
+		Withdraw refundInfo = withdrawService.getRefundInfo(refundOrdchgSq);
+
+		Order order = new Order();
+		order.setOrdNo(refundInfo.getOrdNo());
+		order.setCustNo(refundInfo.getCustNo());
+		order.setOrdNm(refundInfo.getOrdNm());
+		order.setOrdPhnno(refundInfo.getOrdPhnno());
+		order.setRefundAmt(refundInfo.getRefundAmt());
+		order.setGoodsCnt(refundInfo.getGoodsCnt()+"");
+		order.setGoodsNm(refundInfo.getGoodsNm());
+
+		try {
+			kakaotalkService.sendRefundComplete(order, userNo);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		return super.ok(message.getMessage("SUCC_0004"));
 	}	
 	

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

@@ -688,14 +688,16 @@
 				, D.ITEM_CD  AS GOODS_CD -- 상품코드
 				, D.OPT_CD1 -- 옵션1 
 				, D.OPT_CD2 -- 옵션2
-				, B.CHG_QTY * D.ITEM_QTY AS CHG_QTY-- 신청수량 
+				-- , B.CHG_QTY * D.ITEM_QTY AS CHG_QTY-- 신청수량 
+				, B.CHG_QTY AS CHG_QTY-- 신청수량 
 				, G.WD_QTY -- 회수수량 
 				, CASE WHEN B.CHG_STAT = 'G685_60' THEN '환불완료' ELSE '환불대기' END AS WD_STAT  -- 환불컨펌상태 
 				, CASE WHEN B.CHG_STAT = 'G685_60' THEN 'Y' ELSE 'N' END AS WD_STAT_YN   
 				, A.ORD_CHG_SQ -- 주분변경번호 환불컨펌  
 				, DATE_FORMAT(G.REG_DT, '%Y-%m-%d') AS REG_DT  -- 등록일 
 				, E.MALL_GB 
-				, (SELECT SUM((OD.ORD_QTY - OD.CNCL_RTN_QTY) * DI.ITEM_QTY)  FROM TB_ORDER_DETAIL OD JOIN TB_ORDER_DETAIL_ITEM DI ON OD.ORD_NO = DI.ORD_NO AND OD.ORD_DTL_NO = DI.ORD_DTL_NO WHERE OD.ORD_NO= E.ORD_NO AND OD.ORD_DTL_STAT NOT IN ('G013_00','G013_97','G013_98','G013_99')) AS  TOTAL_ORD_QTY -- 주문 총수량  
+ 				-- , (SELECT SUM((OD.ORD_QTY - OD.CNCL_RTN_QTY) * DI.ITEM_QTY)  FROM TB_ORDER_DETAIL OD JOIN TB_ORDER_DETAIL_ITEM DI ON OD.ORD_NO = DI.ORD_NO AND OD.ORD_DTL_NO = DI.ORD_DTL_NO WHERE OD.ORD_NO= E.ORD_NO AND OD.ORD_DTL_STAT NOT IN ('G013_00','G013_97','G013_98','G013_99')) AS  TOTAL_ORD_QTY -- 주문 총수량  
+				, (SELECT SUM(OD.ORD_QTY) FROM TB_ORDER_DETAIL OD WHERE OD.ORD_NO= E.ORD_NO) AS  TOTAL_ORD_QTY -- 주문 총수량
 				, CASE WHEN (SELECT COUNT(*) FROM TB_ORDER_RECALL_EXCEPTION_ITEM EI  WHERE EI.ORDER_DTL_NO = D.ORD_DTL_NO AND EI.REASON_CODE IN('09','11')) > 0 THEN 'Y' ELSE 'N' END AS DELV_EXPN_YN
 				, CA.RA_NO AS ACCOUNT_NO 
 				, CA.RA_NM AS ACCOUNT_NM 

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -513,9 +513,13 @@
 			var leftGfcdUseAmt = spanGfcdUseAmt;
 
 			// 총 주문수량  =  반품수량
+			console.log('toTalOrdQty : ' + toTalOrdQty);
+			console.log('ordChgQty : ' + ordChgQty);
 			if (toTalOrdQty == ordChgQty) {
+				console.log('allCan');
 				// 귀책사유고객
 				if (isCustomer) {
+					console.log('allCan>customer');
 					// 회수요청
 					if (wdGb == "W") { 
 						// 환불금액  = 취소 상품 실결제 금액 + 배송비 - 추가배송비 - 반품배송비 
@@ -566,7 +570,8 @@
 					addDelvFee = leftDelvFee;
 				} 
 				// 회사귀책
-				else { 
+				else {
+					console.log('allCan>company');
 					if (spanSumDeliveryFee > 0) {
 						addDeliveryFee = spanSumDeliveryFee - spanDelvCpnDcAmt;
 						addDeliveryFeeYn = "Y";
@@ -581,8 +586,10 @@
 			} 
 			// 총 주문수량  <>  반품수량
 			else {
+				console.log('notAllCan');
 				// 고객귀책
-				if (isCustomer) {  
+				if (isCustomer) {
+					console.log('notallCan>customer');
 					// 회수요청
 					if (wdGb == "W") {
 						if (Number(enCloseFee) > 0) {
@@ -634,6 +641,7 @@
 				} 
 				// 회사귀책
 				else {
+					console.log('allCan>company');
 					// 2021.07.02 환불컨펌 환불금액계산
 					// 환불금액  = (취소상품실결제금액)
 					refundAmt = spanRealCnclRtnAmt;