어드민 주문 수정 임시 커밋

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

@@ -210,7 +210,7 @@ public class TscOrderChangeService {
 		String chgStat						= TscConstants.OrderChangeStat.PAYMENT_AFTER_CANCEL.value();	// 주문변경상태
 		int payAmt							= map.getInt("spanPayAmt");										// 부분취소 전 결제금액
 		String modType						= "";
-log.info("payAmt >>> {}", payAmt);
+
 		// 무통장입금 결제 주문 전체취소 상태값 처리
 		if (TscConstants.PgGb.KCP.value().equals(pgGb)) {
 			if (TscConstants.PayMeans.BANK_DEPOSIT.value().equals(payMeans)) {
@@ -441,7 +441,7 @@ log.info("payAmt >>> {}", payAmt);
 				pg.setRegNo(userNo);
 				pg.setUpdNo(userNo);
 
-				if (!TscConstants.PgGb.ISTYLE.value().equals(pgGb) && spanRefundAmt > 0) {
+				if (spanRefundAmt > 0) {
 					pgList.add(pg);
 				}
 
@@ -519,7 +519,9 @@ log.info("payAmt >>> {}", payAmt);
 			}
 		}
 
-		wmsService.updateWmsCancel(wmsList);
+		if (wmsList.size() > 0) {
+			wmsService.updateWmsCancel(wmsList);
+		}
 
 		// 6. PG 취소 처리
 		for (Payment pg : pgList) {
@@ -2313,7 +2315,9 @@ log.info("payAmt >>> {}", payAmt);
 			wmsList.add(wms);
 		}
 
-		wmsService.updateWmsCancel(wmsList);
+		if (wmsList.size() > 0) {
+			wmsService.updateWmsCancel(wmsList);
+		}
 
 		// 10. 환불금액 등록
 		Order refundOrder = orderChangeDao.getRefundInfoForAllCancel(vo);

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

@@ -489,6 +489,9 @@
 			 , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
 					ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
 			 , G2.BRAND_CD
+			 , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+									ELSE BG.BRAND_GROUP_KNM
+			   END                                     AS BRAND_NM
 			 , (SELECT Z.BRAND_ENM
 				  FROM TB_BRAND Z
 				 WHERE Z.BRAND_CD = G2.BRAND_CD)       AS BRAND_ENM
@@ -503,19 +506,19 @@
 			 , CASE WHEN OCD.ORD_REQ_CHG_QTY IS NULL
 						THEN 0
 					ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
-			   END                                        ORD_REQ_CHG_QTY
+			   END                                     AS ORD_REQ_CHG_QTY
 			 , CASE WHEN OCD.CANCEL_REQUEST_QTY IS NULL
 						THEN 0
 					ELSE OCD.CANCEL_REQUEST_QTY * ODI.ITEM_QTY
-			   END                                        CANCEL_REQUEST_QTY
+			   END                                     AS CANCEL_REQUEST_QTY
 			 , CASE WHEN OCD.EXCHANGE_REQUEST_QTY IS NULL
 						THEN 0
 					ELSE OCD.EXCHANGE_REQUEST_QTY * ODI.ITEM_QTY
-			   END                                        EXCHANGE_REQUEST_QTY
+			   END                                     AS EXCHANGE_REQUEST_QTY
 			 , CASE WHEN OCD.RETURN_REQUEST_QTY IS NULL
 						THEN 0
 					ELSE OCD.RETURN_REQUEST_QTY * ODI.ITEM_QTY
-			   END                                        RETURN_REQUEST_QTY
+			   END                                     AS RETURN_REQUEST_QTY
 			 , ODI.OPT_ADD_PRICE
 			 , ODI.CPN1_DC_AMT
 			 , ODI.GOODS_CPN_DC_AMT
@@ -536,12 +539,6 @@
 			 , OD.SOLDOUT_MEMO
 			 , OD.INVOICE_NO
 			 , OD.DELV_LOC_CD
-			 , X.G20
-			 , X.G30
-			 , X.G40
-			 , X.G50
-			 , X.G55
-			 , X.G60
 			 , OD.DELV_ADDR_SQ
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
@@ -549,6 +546,11 @@
 		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_97'			-- 교환철회 상품 제외
 		 INNER JOIN TB_GOODS G1
 		    ON OD.GOODS_CD = G1.GOODS_CD
+		 INNER JOIN TB_BRAND B
+		    ON B.BRAND_CD = G1.BRAND_CD
+		 INNER JOIN TB_BRAND_GROUP BG
+		    ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		   AND BG.USE_YN = 'Y'
 		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON OD.ORD_NO = ODI.ORD_NO
 		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -560,42 +562,35 @@
 		   AND P.PAY_STAT = 'G016_30'
 		 INNER JOIN TB_DELIVERY_ADDR DA
 		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-		  LEFT OUTER JOIN (SELECT MAX(Z.G013_20) AS G20
-								, MAX(Z.G013_30) AS G30
-								, MAX(Z.G013_40) AS G40
-								, MAX(Z.G013_50) AS G50
-								, MAX(Z.G013_55) AS G55
-								, MAX(Z.G013_60) AS G60
-								, Z.ORD_NO
-								, Z.ORD_DTL_NO
-							 FROM (SELECT CASE WHEN ODH.ORD_DTL_STAT = 'G013_20' THEN 'G013_20' END G013_20
-										, CASE WHEN ODH.ORD_DTL_STAT = 'G013_30' THEN 'G013_30' END G013_30
-										, CASE WHEN ODH.ORD_DTL_STAT = 'G013_40' THEN 'G013_40' END G013_40
-										, CASE WHEN ODH.ORD_DTL_STAT = 'G013_50' THEN 'G013_50' END G013_50
-										, CASE WHEN ODH.ORD_DTL_STAT = 'G013_55' THEN 'G013_55' END G013_55
-										, CASE WHEN ODH.ORD_DTL_STAT = 'G013_60' THEN 'G013_60' END G013_60
-										, ODH.ORD_NO
-										, ODH.ORD_DTL_NO
-									 FROM TB_ORDER_DETAIL_HST ODH
-									INNER JOIN TB_COMMON_CODE CC
-									   ON ODH.ORD_DTL_STAT = CC.CD
-									WHERE ODH.ORD_NO = #{ordNo}
-									GROUP BY ODH.ORD_DTL_STAT, ODH.ORD_NO, ODH.ORD_DTL_NO
-								  ) Z
-						    GROUP BY Z.ORD_NO, Z.ORD_DTL_NO
-						  ) X
-		    ON OD.ORD_DTL_NO = X.ORD_DTL_NO
 		  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
 								, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
-		  						, SUM(IF(OCD.CHG_STAT = 'G685_20', OCD.CHG_QTY, 0)) AS CANCEL_REQUEST_QTY
-								, SUM(IF(OCD.CHG_STAT = 'G685_30', OCD.CHG_QTY, 0)) AS EXCHANGE_REQUEST_QTY
-								, SUM(IF(OCD.CHG_STAT = 'G685_40', OCD.CHG_QTY, 0)) AS RETURN_REQUEST_QTY
+		  						, SUM(CASE OCD.CHG_STAT WHEN 'G685_10' THEN OCD.CHG_QTY
+		  						                        WHEN 'G685_11' THEN OCD.CHG_QTY
+		  						                        ELSE 0
+		  						       END)                                         AS CANCEL_REQUEST_QTY
+								, SUM(CASE WHEN OCD.CHG_STAT = 'G685_20' THEN OCD.CHG_QTY
+								           WHEN OCD.CHG_STAT = 'G685_21' THEN OCD.CHG_QTY
+								           WHEN OCD.CHG_STAT = 'G685_30' AND OC.CHG_GB = 'G680_40' THEN OCD.CHG_QTY
+								           WHEN OCD.CHG_STAT = 'G685_31' AND OC.CHG_GB = 'G680_40' THEN OCD.CHG_QTY
+								           WHEN OCD.CHG_STAT = 'G685_32' AND OC.CHG_GB = 'G680_40' THEN OCD.CHG_QTY
+								           ELSE 0
+									   END)                                         AS EXCHANGE_REQUEST_QTY
+								, SUM(CASE WHEN OCD.CHG_STAT = 'G685_50' THEN OCD.CHG_QTY
+										   WHEN OCD.CHG_STAT = 'G685_51' THEN OCD.CHG_QTY
+										   WHEN OCD.CHG_STAT = 'G685_33' THEN OCD.CHG_QTY
+										   WHEN OCD.CHG_STAT = 'G685_30' AND OC.CHG_GB = 'G680_30' THEN OCD.CHG_QTY
+										   WHEN OCD.CHG_STAT = 'G685_31' AND OC.CHG_GB = 'G680_30' THEN OCD.CHG_QTY
+										   WHEN OCD.CHG_STAT = 'G685_32' AND OC.CHG_GB = 'G680_30' THEN OCD.CHG_QTY
+										   ELSE 0
+									  END)                                          AS RETURN_REQUEST_QTY
 							 FROM TB_ORDER_CHANGE_DETAIL OCD
+							INNER JOIN TB_ORDER_CHANGE OC
+							   ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
 							INNER JOIN TB_ORDER_DETAIL OD
 							   ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 							WHERE 1 = 1
 							  AND OD.ORD_NO = #{ordNo}
-							  AND OCD.CHG_STAT IN ('G685_20', 'G685_30', 'G685_33', 'G685_40')
+							  AND OCD.CHG_STAT IN ('G685_10', 'G685_11', 'G685_20', 'G685_21', 'G685_30', 'G685_31', 'G685_32', 'G685_33', 'G685_50', 'G685_51')
 							GROUP BY OCD.ORD_DTL_NO
 						  ) OCD
 		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO