관리자 수정

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

@@ -1372,71 +1372,72 @@
 	<select id="getOrderDiscountCouponList" parameterType="Order" resultType="Order">
 		/* order.getOrderDiscountCouponList */
 		  WITH COUPON_DATA AS (
-			  SELECT OD.ORD_NO
-				   , OD.ORD_DTL_NO
-				   , OD.GOODS_CD
-				   , OD.ORD_AMT
-				   , OD.SUPPLY_COMP_CD
-				   , OD.DELV_FEE_CD
-				   , DF.DELV_FEE
-				   , OD.GOODS_CPN_SQ
-				   , OD.GOODS_CPN_DC_AMT
-				   , OD.CART_CPN_SQ
-				   , OD.CART_CPN_DC_AMT
-				   , DF.DELV_CPN_SQ
-				   , DF.DELV_CPN_DC_AMT
-				FROM TB_ORDER_DETAIL OD
-				INNER JOIN TB_DELIVERY_FEE DF
-				ON OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
-					AND OD.DELV_FEE_CD = DF.DELV_FEE_CD
-					AND OD.ORD_NO = DF.ORD_NO
-			   WHERE 1 = 1
-				 AND OD.ORD_NO = #{ordNo}
+		      SELECT OD.ORD_NO
+		           , OD.ORD_DTL_NO
+		           , OD.GOODS_CD
+		           , OD.ORD_AMT
+		           , OD.SUPPLY_COMP_CD
+		           , OD.DELV_FEE_CD
+		           , DF.DELV_FEE
+		           , OD.GOODS_CPN_SQ
+		           , OD.GOODS_CPN_DC_AMT
+		           , OD.CART_CPN_SQ
+		           , OD.CART_CPN_DC_AMT
+		           , DF.DELV_CPN_SQ
+		           , DF.DELV_CPN_DC_AMT
+		        FROM TB_ORDER_DETAIL OD
+		       INNER JOIN TB_DELIVERY_FEE DF
+		          ON OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
+		         AND OD.DELV_FEE_CD = DF.DELV_FEE_CD
+		         AND OD.ORD_NO = DF.ORD_NO
+		       WHERE 1 = 1
+		        AND OD.ORD_NO = #{ordNo}
 		  )
 		SELECT X.*
-			 , CP.CPN_ID
-			 , CP.CPN_NM
-			 , CP.DC_WAY
-			 , CP.DC_PVAL
-			 , CP.DC_MVAL
-			 , CP.DC_AVAL
+		     , CP.CPN_ID
+		     , CP.CPN_NM
+		     , CP.DC_WAY
+		     , CP.DC_PVAL
+		     , CP.DC_MVAL
+		     , CP.DC_AVAL
 		  FROM (
-			  SELECT Z.*
-				FROM (
-					SELECT 1                   AS DISP_ORD
-						 , CD.GOODS_CPN_SQ     AS CPN_SQ
-						 , CD.GOODS_CPN_DC_AMT AS CPN_DC_AMT
-						 , '상품쿠폰'              AS CPN_TYPE
-						 , CD.GOODS_CD         AS TARGET_CD1
-						 , CD.ORD_DTL_NO       AS TARGET_CD2
-						 , CD.ORD_NO
-						 , CD.ORD_AMT
-					  FROM COUPON_DATA CD
-					 UNION ALL
-					SELECT 2                  AS DISP_ORD
-						 , CD.CART_CPN_SQ     AS CPN_SQ
-						 , CD.CART_CPN_DC_AMT AS CPN_DC_AMT
-						 , '장바구니쿠폰'           AS CPN_TYPE
-						 , CD.GOODS_CD        AS TARGET_CD1
-						 , CD.ORD_DTL_NO      AS TARGET_CD2
-						 , CD.ORD_NO
-						 , CD.ORD_AMT
-					  FROM COUPON_DATA CD
-					 UNION ALL
-					SELECT 3                  AS DISP_ORD
-						 , CD.DELV_CPN_SQ     AS CPN_SQ
-						 , CD.DELV_CPN_DC_AMT AS CPN_DC_AMT
-						 , '배송비쿠폰'            AS CPN_TYPE
-						 , CD.SUPPLY_COMP_CD  AS TARGET_CD1
-						 , CD.DELV_FEE_CD     AS TARGET_CD2
-						 , CD.ORD_NO
-						 , CD.DELV_FEE        AS ORD_AMT
-					  FROM COUPON_DATA CD
-					 GROUP BY CD.DELV_CPN_SQ
-							, CD.DELV_CPN_DC_AMT
-							, CD.SUPPLY_COMP_CD
-							, CD.DELV_FEE_CD
-							, CD.ORD_NO
+		      SELECT Z.*
+		        FROM (
+		            SELECT 1                   AS DISP_ORD
+		                 , CD.GOODS_CPN_SQ     AS CPN_SQ
+		                 , CD.GOODS_CPN_DC_AMT AS CPN_DC_AMT
+		                 , '상품쿠폰'              AS CPN_TYPE
+		                 , CD.GOODS_CD         AS TARGET_CD1
+		                 , CD.ORD_DTL_NO       AS TARGET_CD2
+		                 , CD.ORD_NO
+		                 , CD.ORD_AMT
+		              FROM COUPON_DATA CD
+		             UNION ALL
+		            SELECT 2                  AS DISP_ORD
+		                 , CD.CART_CPN_SQ     AS CPN_SQ
+		                 , CD.CART_CPN_DC_AMT AS CPN_DC_AMT
+		                 , '장바구니쿠폰'           AS CPN_TYPE
+		                 , CD.GOODS_CD        AS TARGET_CD1
+		                 , CD.ORD_DTL_NO      AS TARGET_CD2
+		                 , CD.ORD_NO
+		                 , CD.ORD_AMT
+		              FROM COUPON_DATA CD
+		             UNION ALL
+		            SELECT 3                  AS DISP_ORD
+		                 , CD.DELV_CPN_SQ     AS CPN_SQ
+		                 , CD.DELV_CPN_DC_AMT AS CPN_DC_AMT
+		                 , '배송비쿠폰'            AS CPN_TYPE
+		                 , CD.SUPPLY_COMP_CD  AS TARGET_CD1
+		                 , CD.DELV_FEE_CD     AS TARGET_CD2
+		                 , CD.ORD_NO
+		                 , CD.DELV_FEE        AS ORD_AMT
+		              FROM COUPON_DATA CD
+		             GROUP BY CD.DELV_CPN_SQ
+		                    , CD.DELV_CPN_DC_AMT
+		                    , CD.SUPPLY_COMP_CD
+		                    , CD.DELV_FEE_CD
+		                    , CD.ORD_NO
+		                    , CD.DELV_FEE
 				) Z
 			   WHERE 1 = 1
 				 AND Z.CPN_SQ IS NOT NULL

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

@@ -471,8 +471,6 @@
 				, ORG_ORD_DTL_NO
 				, SUPPLY_COMP_CD
 				, GOODS_CD
-				, PRODUCT_NO
-				, PRODUCT_CODE
 				, FORMAL_GB
 				, GOODS_TYPE
 				, LIST_PRICE
@@ -545,8 +543,6 @@
 			 , OD.ORG_ORD_DTL_NO
 			 , OD.SUPPLY_COMP_CD
 			 , OD.GOODS_CD
-			 , OD.PRODUCT_NO
-			 , OD.PRODUCT_CODE
 			 , OD.FORMAL_GB
 			 , OD.GOODS_TYPE
 			 , OD.LIST_PRICE
@@ -888,160 +884,157 @@
 	
 	<!-- 주문상세이력정보등록 취소신청철회 -->
 	<insert id="createOrderDtlHstCancel" parameterType="Order">
-	INSERT INTO TB_ORDER_DETAIL_HST (
-		ORD_DTL_NO
-		, ORD_NO
-		, ORD_EXCH_GB
-		, ORD_DTL_STAT
-		, ORG_ORD_DTL_NO
-		, SUPPLY_COMP_CD
-		, GOODS_CD
-		, PRODUCT_NO
-		, PRODUCT_CODE
-		, FORMAL_GB
-		, GOODS_TYPE
-		, LIST_PRICE
-		, CURR_PRICE
-		, DC_RATE
-		, OPT_ADD_PRICE
-		, ORD_QTY
-		, ORD_AMT
-		, CNCL_RTN_QTY
-		, CNCL_RTN_AMT
-		, CPN1_CPN_SQ
-		, CPN1_DC_AMT
-		, TMTB1_SQ
-		, TMTB1_DC_AMT
-		, TMTB2_SQ
-		, TMTB2_DC_AMT
-		, GOODS_CPN_SQ
-		, GOODS_CPN_DC_AMT
-		, CART_CPN_SQ
-		, CART_CPN_DC_AMT
-		, BURDEN_RATE
-		, PNT_DC_AMT
-		, PRE_PNT_DC_AMT
-		, SAVE_PNT_AMT
-		, REAL_ORD_AMT
-		, GFCD_USE_AMT
-		, VENDOR_ID
-		, EXTMALL_ID
-		, AGENT_ORDER_ID
-		, EXTMALL_ORDER_ID
-		, CHANGABLE_YN
-		, CHANGE_FEE_FREE_YN
-		, RETURNABLE_YN
-		, RETURN_FEE_FREE_YN
-		, SOLDOUT_YN
-		, SOLDOUT_MEMO
-		, SOLDOUT_REG_NO
-		, SOLDOUT_REG_DT
-		, DELV_ADDR_SQ
-		, DELV_FEE_CD
-		, SHOT_DELV_YN
-		, GIFT_PACK_YN
-		, MAKE_GOODS_YN
-		, ENTRY_NO
-		, DELV_LOC_CD
-		, DELV_ASSIGN_DT
-		, DELV_ASSIGN_STAT
-		, DSTRBT_NOTE
-		, DELV_STDT
-		, DELV_EDDT
-		, SHIP_COMP_CD
-		, INVOICE_NO
-		, INVOICE_SEND_YN
-		, SELL_STORE_CD
-		, SELL_FEE_RATE
-		, AF_LINK_CD
-		, ITHR_CD
-		, CONTENTS_LOC
-		, PLAN_DTL_SQ
-		, SOCIAL_SQ
-		, REG_NO
-		, REG_DT
-		, UPD_NO
-		, UPD_DT
-		)
-	SELECT OD.ORD_DTL_NO
-		 , OD.ORD_NO
-		 , OD.ORD_EXCH_GB
-		 , OCD.CHG_STAT
-		 , OD.ORG_ORD_DTL_NO
-		 , OD.SUPPLY_COMP_CD
-		 , OD.GOODS_CD
-		 , OD.PRODUCT_NO
-		 , OD.PRODUCT_CODE
-		 , OD.FORMAL_GB
-		 , OD.GOODS_TYPE
-		 , OD.LIST_PRICE
-		 , OD.CURR_PRICE
-		 , OD.DC_RATE
-		 , OD.OPT_ADD_PRICE
-		 , OD.ORD_QTY
-		 , OD.ORD_AMT
-		 , OCD.CHG_QTY
-		 , OD.CNCL_RTN_AMT
-		 , OD.CPN1_CPN_SQ
-		 , OD.CPN1_DC_AMT
-		 , OD.TMTB1_SQ
-		 , OD.TMTB1_DC_AMT
-		 , OD.TMTB2_SQ
-		 , OD.TMTB2_DC_AMT
-		 , OD.GOODS_CPN_SQ
-		 , OD.GOODS_CPN_DC_AMT
-		 , OD.CART_CPN_SQ
-		 , OD.CART_CPN_DC_AMT
-		 , OD.BURDEN_RATE
-		 , OD.PNT_DC_AMT
-		 , OD.PRE_PNT_DC_AMT
-		 , OD.SAVE_PNT_AMT
-		 , OD.REAL_ORD_AMT
-		 , OD.GFCD_USE_AMT
-		 , OD.VENDOR_ID
-		 , OD.EXTMALL_ID
-		 , OD.AGENT_ORDER_ID
-		 , OD.EXTMALL_ORDER_ID
-		 , OD.CHANGABLE_YN
-		 , OD.CHANGE_FEE_FREE_YN
-		 , OD.RETURNABLE_YN
-		 , OD.RETURN_FEE_FREE_YN
-		 , OD.SOLDOUT_YN
-		 , OD.SOLDOUT_MEMO
-		 , OD.SOLDOUT_REG_NO
-		 , OD.SOLDOUT_REG_DT
-		 , OD.DELV_ADDR_SQ
-		 , OD.DELV_FEE_CD
-		 , OD.SHOT_DELV_YN
-		 , OD.GIFT_PACK_YN
-		 , OD.MAKE_GOODS_YN
-		 , OD.ENTRY_NO
-		 , OD.DELV_LOC_CD
-		 , OD.DELV_ASSIGN_DT
-		 , OD.DELV_ASSIGN_STAT
-		 , OD.DSTRBT_NOTE
-		 , OD.DELV_STDT
-		 , OD.DELV_EDDT
-		 , OD.SHIP_COMP_CD
-		 , OD.INVOICE_NO
-		 , OD.INVOICE_SEND_YN
-		 , OD.SELL_STORE_CD
-		 , OD.SELL_FEE_RATE
-		 , OD.AF_LINK_CD
-		 , OD.ITHR_CD
-		 , OD.CONTENTS_LOC
-		 , OD.PLAN_DTL_SQ
-		 , OD.SOCIAL_SQ
-		 , #{regNo}
-		 , NOW()
-		 , #{updNo}
-		 , NOW()
-	  FROM TB_ORDER_DETAIL OD
-	 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
-	    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
-	 WHERE 1 = 1
-	   AND OCD.ORD_CHG_SQ = #{ordChgSq}
-	   AND OD.ORD_NO = #{ordNo}
+		/* OrderChange.createOrderDtlHstCancel */
+		INSERT INTO TB_ORDER_DETAIL_HST (
+			ORD_DTL_NO
+			, ORD_NO
+			, ORD_EXCH_GB
+			, ORD_DTL_STAT
+			, ORG_ORD_DTL_NO
+			, SUPPLY_COMP_CD
+			, GOODS_CD
+			, FORMAL_GB
+			, GOODS_TYPE
+			, LIST_PRICE
+			, CURR_PRICE
+			, DC_RATE
+			, OPT_ADD_PRICE
+			, ORD_QTY
+			, ORD_AMT
+			, CNCL_RTN_QTY
+			, CNCL_RTN_AMT
+			, CPN1_CPN_SQ
+			, CPN1_DC_AMT
+			, TMTB1_SQ
+			, TMTB1_DC_AMT
+			, TMTB2_SQ
+			, TMTB2_DC_AMT
+			, GOODS_CPN_SQ
+			, GOODS_CPN_DC_AMT
+			, CART_CPN_SQ
+			, CART_CPN_DC_AMT
+			, BURDEN_RATE
+			, PNT_DC_AMT
+			, PRE_PNT_DC_AMT
+			, SAVE_PNT_AMT
+			, REAL_ORD_AMT
+			, GFCD_USE_AMT
+			, VENDOR_ID
+			, EXTMALL_ID
+			, AGENT_ORDER_ID
+			, EXTMALL_ORDER_ID
+			, CHANGABLE_YN
+			, CHANGE_FEE_FREE_YN
+			, RETURNABLE_YN
+			, RETURN_FEE_FREE_YN
+			, SOLDOUT_YN
+			, SOLDOUT_MEMO
+			, SOLDOUT_REG_NO
+			, SOLDOUT_REG_DT
+			, DELV_ADDR_SQ
+			, DELV_FEE_CD
+			, SHOT_DELV_YN
+			, GIFT_PACK_YN
+			, MAKE_GOODS_YN
+			, ENTRY_NO
+			, DELV_LOC_CD
+			, DELV_ASSIGN_DT
+			, DELV_ASSIGN_STAT
+			, DSTRBT_NOTE
+			, DELV_STDT
+			, DELV_EDDT
+			, SHIP_COMP_CD
+			, INVOICE_NO
+			, INVOICE_SEND_YN
+			, SELL_STORE_CD
+			, SELL_FEE_RATE
+			, AF_LINK_CD
+			, ITHR_CD
+			, CONTENTS_LOC
+			, PLAN_DTL_SQ
+			, SOCIAL_SQ
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+			)
+		SELECT OD.ORD_DTL_NO
+			 , OD.ORD_NO
+			 , OD.ORD_EXCH_GB
+			 , OCD.CHG_STAT
+			 , OD.ORG_ORD_DTL_NO
+			 , OD.SUPPLY_COMP_CD
+			 , OD.GOODS_CD
+			 , OD.FORMAL_GB
+			 , OD.GOODS_TYPE
+			 , OD.LIST_PRICE
+			 , OD.CURR_PRICE
+			 , OD.DC_RATE
+			 , OD.OPT_ADD_PRICE
+			 , OD.ORD_QTY
+			 , OD.ORD_AMT
+			 , OCD.CHG_QTY
+			 , OD.CNCL_RTN_AMT
+			 , OD.CPN1_CPN_SQ
+			 , OD.CPN1_DC_AMT
+			 , OD.TMTB1_SQ
+			 , OD.TMTB1_DC_AMT
+			 , OD.TMTB2_SQ
+			 , OD.TMTB2_DC_AMT
+			 , OD.GOODS_CPN_SQ
+			 , OD.GOODS_CPN_DC_AMT
+			 , OD.CART_CPN_SQ
+			 , OD.CART_CPN_DC_AMT
+			 , OD.BURDEN_RATE
+			 , OD.PNT_DC_AMT
+			 , OD.PRE_PNT_DC_AMT
+			 , OD.SAVE_PNT_AMT
+			 , OD.REAL_ORD_AMT
+			 , OD.GFCD_USE_AMT
+			 , OD.VENDOR_ID
+			 , OD.EXTMALL_ID
+			 , OD.AGENT_ORDER_ID
+			 , OD.EXTMALL_ORDER_ID
+			 , OD.CHANGABLE_YN
+			 , OD.CHANGE_FEE_FREE_YN
+			 , OD.RETURNABLE_YN
+			 , OD.RETURN_FEE_FREE_YN
+			 , OD.SOLDOUT_YN
+			 , OD.SOLDOUT_MEMO
+			 , OD.SOLDOUT_REG_NO
+			 , OD.SOLDOUT_REG_DT
+			 , OD.DELV_ADDR_SQ
+			 , OD.DELV_FEE_CD
+			 , OD.SHOT_DELV_YN
+			 , OD.GIFT_PACK_YN
+			 , OD.MAKE_GOODS_YN
+			 , OD.ENTRY_NO
+			 , OD.DELV_LOC_CD
+			 , OD.DELV_ASSIGN_DT
+			 , OD.DELV_ASSIGN_STAT
+			 , OD.DSTRBT_NOTE
+			 , OD.DELV_STDT
+			 , OD.DELV_EDDT
+			 , OD.SHIP_COMP_CD
+			 , OD.INVOICE_NO
+			 , OD.INVOICE_SEND_YN
+			 , OD.SELL_STORE_CD
+			 , OD.SELL_FEE_RATE
+			 , OD.AF_LINK_CD
+			 , OD.ITHR_CD
+			 , OD.CONTENTS_LOC
+			 , OD.PLAN_DTL_SQ
+			 , OD.SOCIAL_SQ
+			 , #{regNo}
+			 , NOW()
+			 , #{updNo}
+			 , NOW()
+		  FROM TB_ORDER_DETAIL OD
+		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
+		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		 WHERE 1 = 1
+		   AND OCD.ORD_CHG_SQ = #{ordChgSq}
+		   AND OD.ORD_NO = #{ordNo}
 	</insert>
 
 	<!-- 주문상세정보 생성 -->