Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -715,22 +715,18 @@ public class TsfMypageController extends TsfBaseController {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		// TODO
-		// @ 주문취소시 상태값 체크
-		// @ 취소, 반품시 배송비 체크 로직 (선결제 로직)
-
 		// 1. 세션회원조회
 		int custNo = TsfSession.getInfo().getCustNo();
 		orderChange.setCustNo(custNo);
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
 		String supplyCompCd = refundPreInfo.getString("supplyCompCd");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호
@@ -759,8 +755,20 @@ public class TsfMypageController extends TsfBaseController {
 		result.set("chgerRtnMemo", orderChange.getChgerRtnMemo());		// 반품메모
 
 		// 6. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-		coreOrderChangeService.returnRequest(result);
-		// coreOrderChangeService.rtnReq(result, custNo);
+		GagaMap map = coreOrderChangeService.returnRequest(result);
+		Integer ordChgSq = map.getInt("ordChgSq");
+
+		if (ordChgSq > 0) {
+			// 반품 알림톡 관련 정보 조회
+			orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+
+			try {
+				// 반품 알림톡 발송
+				coreKakaotalkService.sendOrderReturnRequest(orderChange, custNo);
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
+		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		if (orderChange.getAddPayCost() == 0) {
@@ -868,25 +876,19 @@ public class TsfMypageController extends TsfBaseController {
 		// 2. 취소완료 처리
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
 
-		// TODO
+		// 3. 취소완료 카카오알림톡 발송
 		Integer ordChgSq = result.getInt("ordChgSq");
 		
-		// ordChgSq 로 아래 정보 조회하는 쿼리 작성 후 데이터 설정
-		// orderChange.setOrdPhnno();
-		// orderChange.setRefundAmt();
-		// orderChange.setOrdNm();
-		// orderChange.setOrdNo();
-		// orderChange.setGoodsNm();
-		// orderChange.setGoodsCnt();
-		// orderChange.setPayMeans();
-		// orderChange.setPayMeansNm();
-		// orderChange.setPgGb();
-		// orderChange.setCustNo();
-		
-		try {
-			coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
-		} catch (Exception e) {
-			throw new IllegalStateException(message.getMessage("FAIL_0004"));
+		if (ordChgSq > 0) {
+			// 취소 알림톡 관련 정보 조회
+			orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+
+			try {
+				// 취소 알림톡 발송
+				coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
 		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -681,11 +681,11 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호