Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1115,9 +1115,15 @@ public class TsfOrderService {
 		// 로그인 정보 조회
 		if(TsfSession.isLogin()) {
 			param.setCustNo(TsfSession.getInfo().getCustNo());
+			param.setOrdNm(TsfSession.getInfo().getCustNm());
+			param.setOrdPhnno(TsfSession.getInfo().getCellPhnno());
+			param.setEmail(TsfSession.getInfo().getEmail());
 		} else {
 			param.setCustNo(0);
 			param.setJsessionId(TsfSession.getSessionId());
+			param.setOrdNm("비회원");
+			param.setOrdPhnno("000-0000-0000");
+			param.setEmail("naverpay@naverpay.com");
 		}
 
 		try {

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

@@ -877,17 +877,25 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
 
 		// 3. 취소완료 카카오알림톡 발송
-		Integer ordChgSq = result.getInt("ordChgSq");
+		int ordChgSq = result.getInt("ordChgSq");
 		
 		if (ordChgSq > 0) {
-			// 취소 알림톡 관련 정보 조회
-			orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
-			
-			GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
-
 			try {
+				// 취소 알림톡 관련 정보 조회
+				orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+
 				// 취소 알림톡 발송
-				coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
+				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
+					coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
+				}
+
+				// 취소 안내 메일 정보 조회
+				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
+
+				// 취소 안내 메일 발송
+				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+					mailService.sendOrderCancel(replaceInfo, custNo);
+				}
 			} catch (Exception e) {
 				throw new IllegalStateException(message.getMessage("FAIL_0004"));
 			}

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

@@ -19,7 +19,9 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCustomerService;
+import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscKcpService;
+import com.style24.core.biz.service.TscMailService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
@@ -100,6 +102,12 @@ public class TsfNoMemberController extends TsfBaseController {
 	@Autowired
 	private TscKcpService coreKcpService;
 
+	@Autowired
+	private TscKakaotalkService coreKakaotalkService;
+
+	@Autowired
+	private TscMailService coreMailService;
+
 	/**
 	 * 비회원 주문 내역
 	 *
@@ -563,8 +571,30 @@ public class TsfNoMemberController extends TsfBaseController {
 		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
 
-		// TODO
-		// 취소 완료 알림톡 발송 에정
+		// 2. 취소완료 카카오알림톡 발송
+		int ordChgSq = result.getInt("ordChgSq");
+
+		if (ordChgSq > 0) {
+			try {
+				// 취소 알림톡 관련 정보 조회
+				orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+
+				// 취소 알림톡 발송
+				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
+					coreKakaotalkService.sendOrderCancelComplete(orderChange, 0);
+				}
+
+				// 취소 안내 메일 정보 조회
+				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
+
+				// 취소 안내 메일 발송
+				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+					coreMailService.sendOrderCancel(replaceInfo, 0);
+				}
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
+		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		result.set("message", message.getMessage("CANCEL_0001"));

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

@@ -948,7 +948,7 @@
 		             , G.MAIN_COLOR_CD
 		             , G.SELF_GOODS_YN
 		             , MAX(CD.CART_DTL_SQ) AS CART_DTL_SQ
-		             , MAX(ST.DISP_ORD) AS DISP_ORD
+		             , MIN(ST.DISP_ORD) AS DISP_ORD
 		             , MAX(CD.OPT_CD1) AS CART_OPT_CD1
 		             , MAX(CD.OPT_CD2) AS CART_OPT_CD2
 		             , MAX(CD.OPT_CD) AS CART_OPT_CD
@@ -972,7 +972,7 @@
 		LEFT   OUTER JOIN TB_COLOR C
 		ON     A.CART_OPT_CD1 = C.COLOR_CD
 		AND    C.USE_YN = 'Y'
-		ORDER  BY NULLIF(C.COLOR_KNM, A.CART_OPT_CD1)
+		ORDER  BY A.DISP_ORD, A.COLOR_NM
 	</select>
 
 	<!-- 장바구니 상품 사이즈 정보 조회 -->

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

@@ -287,6 +287,7 @@
 		                      WHEN VS.CURR_STOCK_QTY - G.MIN_ORD_QTY >= 0 THEN VS.CURR_STOCK_QTY
 		                      ELSE 0 END) AS STOCK_QTY
 		           , IFNULL(GC.QTY , 1) AS QTY
+		           , MIN(O.DISP_ORD) AS DISP_ORD
 		      FROM TB_GOODS G
 		      INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
 		                             AND O.DISP_YN = 'Y'
@@ -305,7 +306,7 @@
 		<if test='optionSoldoutSkip != null and optionSoldoutSkip == "Y" '>
 		AND A.STOCK_QTY > 0
 		</if>
-		ORDER BY A.GOODS_CD, NULLIF(C.COLOR_KNM, A.OPT_CD1)
+		ORDER BY A.GOODS_CD, A.DISP_ORD, IFNULL(C.COLOR_KNM, A.OPT_CD1)
 	</select>
 		
 	<!-- 상품 옵션2 목록  - 자사용-->

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

@@ -148,6 +148,7 @@
 				    ON O.ORD_NO = P.ORD_NO
 				   AND P.PAY_GB = 'O'
 				   AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 				  LEFT OUTER JOIN TB_REVIEW R
 				    ON R.ORD_NO = OD.ORD_NO
 				   AND R.ORD_DTL_NO = OD.ORD_DTL_NO
@@ -236,6 +237,11 @@
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
+		         INNER JOIN TB_PAYMENT P
+		            ON O.ORD_NO = P.ORD_NO
+		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		           AND P.PAY_GB = 'O'
+		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 				 WHERE O.DISP_YN = 'Y'
 				   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 				   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
@@ -275,6 +281,11 @@
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON O.ORD_NO = OD.ORD_NO
+		 INNER JOIN TB_PAYMENT P
+		    ON O.ORD_NO = P.ORD_NO
+		   AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		   AND P.PAY_GB = 'O'
+		   AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		 WHERE O.DISP_YN = 'Y'
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')

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

@@ -490,6 +490,7 @@
 		          FROM TB_ORDER_CHANGE OC
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		           AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		          LEFT OUTER JOIN (SELECT ORD_CHG_SQ
 		                                , ORD_DTL_NO
 		                                , CHG_STAT
@@ -513,6 +514,11 @@
 		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_ORDER O
 		            ON OD.ORD_NO = O.ORD_NO
+		         INNER JOIN TB_PAYMENT P
+		            ON O.ORD_NO = P.ORD_NO
+		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		           AND P.PAY_GB = 'O'
+		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -604,6 +610,7 @@
 		          FROM TB_ORDER_CHANGE OC
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		           AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
@@ -613,10 +620,14 @@
 		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_ORDER O
 		            ON OD.ORD_NO = O.ORD_NO
+		         INNER JOIN TB_PAYMENT P
+		            ON O.ORD_NO = P.ORD_NO
+		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		           AND P.PAY_GB = 'O'
+		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_GOODS G1
 		            ON OD.GOODS_CD = G1.GOODS_CD
 		         INNER JOIN TB_GOODS G2
@@ -686,6 +697,7 @@
 		  FROM TB_ORDER_CHANGE OC
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		   AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		    ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		   AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
@@ -695,10 +707,14 @@
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		 INNER JOIN TB_ORDER O
 		    ON OD.ORD_NO = O.ORD_NO
+		 INNER JOIN TB_PAYMENT P
+		    ON O.ORD_NO = P.ORD_NO
+		   AND P.PAY_STAT IN ('G016_10', 'G016_30')
+		   AND P.PAY_GB = 'O'
+		   AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON OD.ORD_NO = ODI.ORD_NO
 		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		 INNER JOIN TB_GOODS G1
 		    ON OD.GOODS_CD = G1.GOODS_CD
 		 INNER JOIN TB_GOODS G2

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -410,7 +410,7 @@ var fnCancel = function() {
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
-	});
+	}, true);
 }
 
 // 취소 수량 변경 이벤트 처리

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -947,7 +947,7 @@
 				
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 					cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
-				});
+				}, true);
 			}
 		});
 	}
@@ -1006,7 +1006,7 @@
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-		});
+		}, true);
 	}
 
 	// 전체구매확정 버튼 클릭 이벤트

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -405,11 +405,11 @@ var fnCancel = function() {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-			}, true);
+			});
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
-	});
+	}, true);
 }
 
 // 취소 수량 변경 이벤트 처리

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -718,12 +718,12 @@
 				data.reqGbn = 'cnclComplete';
 				data.ordDtlNoArr = ordDtlNoArr;
 				data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
-				console.log(data);
+
 				let jsonData = JSON.stringify(data);
 				
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-				});
+				}, true);
 			}
 		});
 	}
@@ -782,7 +782,7 @@
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
-		});
+		}, true);
 	}
 </script>
 

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -597,7 +597,7 @@
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
 					}
-				});
+				}, true);
 				
 				
 			}
@@ -675,7 +675,7 @@
 		
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-		});
+		}, true);
 	}
 	
 	// 전체구매확정 버튼 클릭 이벤트

src/main/webapp/biz/mypage.js

@@ -481,7 +481,7 @@ var fnCreCancel = function(param, noMember) {
 				} else {
 					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 				}
-			});
+			}, true);
 		}
 	});
 }