Sfoglia il codice sorgente

반품TO반품 임시 커밋

card007 4 anni fa
parent
commit
7c7822612c

+ 2 - 6
src/main/java/com/style24/core/biz/dao/TscOrderChangeDao.java

@@ -56,7 +56,6 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int updateOrderDetailItem(Order order);
-	int updateOrderDetailItemTemp(Order order);
 	
 	/**
 	 * 주문상세단품이력정보 등록
@@ -67,7 +66,6 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createOrderDetailItemHst(Order order);
-	int createOrderDetailItemHstTemp(Order order);
 	
 	/**
 	 * 상품옵션재고정보 등록
@@ -118,8 +116,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int updateOrderDetail(Order order);
-	int updateOrderDetailTemp(Order order);
-	
+
 	/**
 	 * 주문상세이력정보 (취소,반품) 등록
 	 *
@@ -129,8 +126,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createOrderDetailHstCnclRtn(Order order);
-	int createOrderDetailHstCnclRtnTemp(Order order);
-	
+
 	/**
 	 * 주문환불금액정보(PG) 등록
 	 *

+ 1 - 1
src/main/java/com/style24/core/biz/service/TscDeliveryService.java

@@ -121,7 +121,7 @@ public class TscDeliveryService {
 				orderChangeService.cancelRequest(change);
 			} else {		// 무통장입금 주문 중 환불계좌정보 없을 경우 제외는 취소처리
 				// 취소완료
-				GagaMap cancelInfo = orderChangeService.orderCancelPreInfoTemp(change, userNo);
+				GagaMap cancelInfo = orderChangeService.orderCancelPreInfo(change, userNo);
 
 				// TODO 취소 완료 알림톡 발송 에정
 				//

+ 11 - 10
src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -224,10 +224,10 @@ public class TscOrderChangeService {
 						int leftQty = vo.getOrdQty() - vo.getCnclRtnQty() - vo.getOrdCanChgQty();
 
 						// 3-2-1. 주문상세정보 수정
-						orderChangeDao.updateOrderDetailTemp(vo);
+						orderChangeDao.updateOrderDetail(vo);
 
 						// 3-2-2. 주문상세 이력 등록
-						orderChangeDao.createOrderDetailHstCnclRtnTemp(vo);
+						orderChangeDao.createOrderDetailHstCnclRtn(vo);
 
 						// 3-2-3. 주문상세단품정보 수정 및 주문상세단품이력 등록
 						// 주문상세단품정보조회
@@ -311,8 +311,8 @@ public class TscOrderChangeService {
 							orderDetailItem.setUpdNo(userNo);
 							orderDetailItem.setOrdDtlStat(ordDtlStat);
 
-							orderChangeDao.updateOrderDetailItemTemp(orderDetailItem);
-							orderChangeDao.createOrderDetailItemHstTemp(orderDetailItem);
+							orderChangeDao.updateOrderDetailItem(orderDetailItem);
+							orderChangeDao.createOrderDetailItemHst(orderDetailItem);
 
 							index++;
 						}
@@ -885,6 +885,7 @@ public class TscOrderChangeService {
 		Integer regNo = excReq.getRegNo();					// 등록자번호
 		Integer updNo = excReq.getUpdNo();					// 수정자번호
 		String wdTargetYn = excReq.getWdTargetYn();			// 회수지시여부
+		String selfGoodsYn = excReq.getSelfGoodsYn();		// 자사여부
 		int ordChgSq = 0;									// 주문변경일련번호
 
 		// 교환신청 목록 설정
@@ -931,7 +932,7 @@ public class TscOrderChangeService {
 		int exchangeOrdDtlNo = 0;
 
 		for (Order order : excReqList) {
-			String delvFeeCd = order.getDelvFeeCd();
+			String delvFeeCd = "Y".equals(selfGoodsYn) ? "WMS" : order.getDelvFeeCd();
 			int chgQty = order.getChgQty();
 			String ordChgOpt = order.getOrdChgOpt();
 			int ordDtlNo = order.getOrdDtlNo();
@@ -1634,7 +1635,7 @@ public class TscOrderChangeService {
 	 */
 	@SuppressWarnings("unchecked")
 	@Transactional("shopTxnManager")
-	public GagaMap orderCancelPreInfoTemp(OrderChange orderChange, Integer userNo) {
+	public GagaMap orderCancelPreInfo(OrderChange orderChange, Integer userNo) {
 		GagaMap result = new GagaMap();
 		Integer ordChgSq;
 
@@ -1960,10 +1961,10 @@ public class TscOrderChangeService {
 						int leftQty = vo.getOrdQty() - vo.getCnclRtnQty() - vo.getOrdCanChgQty();
 
 						// 3-2-1. 주문상세정보 수정
-						orderChangeDao.updateOrderDetailTemp(vo);
+						orderChangeDao.updateOrderDetail(vo);
 
 						// 3-2-2. 주문상세 이력 등록
-						orderChangeDao.createOrderDetailHstCnclRtnTemp(vo);
+						orderChangeDao.createOrderDetailHstCnclRtn(vo);
 
 						// 3-2-3. 주문상세단품정보 수정 및 주문상세단품이력 등록
 						// 주문상세단품정보조회
@@ -2049,8 +2050,8 @@ public class TscOrderChangeService {
 							
 							log.info("ordDtlStat ::: {}", ordDtlStat);
 
-							orderChangeDao.updateOrderDetailItemTemp(orderDetailItem);
-							orderChangeDao.createOrderDetailItemHstTemp(orderDetailItem);
+							orderChangeDao.updateOrderDetailItem(orderDetailItem);
+							orderChangeDao.createOrderDetailItemHst(orderDetailItem);
 
 							index++;
 						}

+ 2 - 2
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -1402,7 +1402,7 @@ public class TscOrderService {
 				// 주문상세 상태값 변경
 				order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
 				order.setOrdDtlNo(ordDtlNo);
-				orderDao.changedOrdDtlStat(order);
+				this.saveOrdDtlStat(order);
 			}
 			
 			result.set("message", NumberFormat.getInstance().format(gvPointAmt) + "P가 적립되었습니다.");
@@ -2354,7 +2354,7 @@ public class TscOrderService {
 
 				} else {		// 무통장입금 주문 중 환불계좌정보 없을 경우 제외는 취소처리
 					// 취소완료
-					GagaMap cancelInfo = orderChangeService.orderCancelPreInfoTemp(change, userNo);
+					GagaMap cancelInfo = orderChangeService.orderCancelPreInfo(change, userNo);
 
 					// 3. 취소완료 카카오알림톡 발송
 					Integer ordChgSq = cancelInfo.getInt("ordChgSq");

+ 4 - 2
src/main/java/com/style24/persistence/domain/Order.java

@@ -34,8 +34,8 @@ public class Order extends TscBaseDomain {
 	private String ordTelno;						// 주문자핸드폰번호
 	private String siteCd;							// 사이트코드
 	private String siteCdNm;						// 사이트코드명
-	private String npayOrdNo;							// 네이버페이주문번호
-	private String npayOrdDtlNo;						// 네이버페이 상품주문번호(주문상세번호)
+	private String npayOrdNo;						// 네이버페이주문번호
+	private String npayOrdDtlNo;					// 네이버페이 상품주문번호(주문상세번호)
 	private String frontGb;							// 프론트구분 (P, M, A)
 	private String frontGbNm;						// 프론트구분명 (PC, MOBILE, APP)
 	private String extmallNm;						// 외부몰명
@@ -728,6 +728,8 @@ public class Order extends TscBaseDomain {
 
 	private int dtlOrdAmt;
 	private int dtlItemOrdAmt;
+	
+	private String ordChgGb;
 
 	// 네이버페이 주문형
 	private String stdt;

+ 1 - 0
src/main/java/com/style24/persistence/domain/OrderChange.java

@@ -225,4 +225,5 @@ public class OrderChange extends TscBaseDomain {
 	private int codFee;
 	private int encloseFee;	
 	private int goodsCnt;
+	private String ordChgGb;
 }

+ 3 - 313
src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -473,31 +473,6 @@
 	<!-- 주문상세단품정보 수정 -->
 	<update id="updateOrderDetailItem" parameterType="Order">
 		/* OrderChange.updateOrderDetailItem */
-		UPDATE TB_ORDER_DETAIL_ITEM ODI
-		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		   SET ODI.CNCL_RTN_AMT     = ODI.CNCL_RTN_AMT + #{cnclRtnAmt}
-		     , ODI.CPN1_DC_AMT      = ODI.CPN1_DC_AMT - #{cpn1DcAmt}
-		     , ODI.TMTB1_DC_AMT     = ODI.TMTB1_DC_AMT - #{tmtb1DcAmt}
-		     , ODI.TMTB2_DC_AMT     = ODI.TMTB2_DC_AMT - #{tmtb2DcAmt}
-		     , ODI.GOODS_CPN_DC_AMT = ODI.GOODS_CPN_DC_AMT - #{goodsCpnDcAmt}
-		     , ODI.CART_CPN_DC_AMT  = ODI.CART_CPN_DC_AMT - #{cartCpnDcAmt}
-		     , ODI.PNT_DC_AMT       = ODI.PNT_DC_AMT - #{pntDcAmt}
-		     , ODI.PRE_PNT_DC_AMT   = ODI.PRE_PNT_DC_AMT - #{prePntDcAmt}
-		     , ODI.SAVE_PNT_AMT     = ODI.SAVE_PNT_AMT - #{savePntAmt}
-		     , ODI.REAL_ORD_AMT     = ODI.REAL_ORD_AMT - #{realOrdAmt}
-		     , ODI.GFCD_USE_AMT     = ODI.GFCD_USE_AMT - #{gfcdUseAmt}
-		     , ODI.UPD_NO           = #{updNo}
-		     , ODI.UPD_DT           = NOW()
-		 WHERE 1 = 1
-		   AND ODI.ORD_NO = #{ordNo}
-		   AND ODI.ORD_DTL_NO = #{ordDtlNo}
-		   AND ODI.ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
-	</update>
-
-	<!-- 주문상세단품정보 수정 -->
-	<update id="updateOrderDetailItemTemp" parameterType="Order">
-		/* OrderChange.updateOrderDetailItemTemp */
 		UPDATE TB_ORDER_DETAIL_ITEM
 		   SET CNCL_RTN_AMT     = #{cnclRtnAmt}
 		     , CPN1_DC_AMT      = #{cpn1DcAmt}
@@ -519,78 +494,6 @@
 
 	<!-- 주문상세단품이력정보 등록 -->
 	<insert id="createOrderDetailItemHst" parameterType="Order">
-		/* OrderChange.createOrderDetailItemHst */
-		INSERT INTO TB_ORDER_DETAIL_ITEM_HST (
-		       ORD_DTL_ITEM_SQ
-		     , ORD_DTL_NO
-		     , ORD_NO
-		     , ORD_DTL_STAT
-		     , ITEM_CD
-		     , OPT_CD
-		     , OPT_CD1
-		     , OPT_CD2
-		     , SKU_MODEL_NO
-		     , PRODUCT_NO
-		     , PRODUCT_CODE
-		     , ITEM_QTY
-		     , ITEM_PRICE
-		     , OPT_ADD_PRICE
-		     , DISP_ORD
-		     , ORD_AMT
-		     , CNCL_RTN_AMT
-		     , CPN1_DC_AMT
-		     , TMTB1_DC_AMT
-		     , TMTB2_DC_AMT
-		     , GOODS_CPN_DC_AMT
-		     , CART_CPN_DC_AMT
-		     , PNT_DC_AMT
-		     , PRE_PNT_DC_AMT
-		     , SAVE_PNT_AMT
-		     , REAL_ORD_AMT
-		     , GFCD_USE_AMT
-		     , REG_NO
-		     , REG_DT
-		     , UPD_NO
-		     , UPD_DT
-		)
-		SELECT ORD_DTL_ITEM_SQ
-		     , ORD_DTL_NO
-		     , ORD_NO
-		     , #{ordDtlStat}
-		     , ITEM_CD
-		     , OPT_CD
-		     , OPT_CD1
-		     , OPT_CD2
-		     , SKU_MODEL_NO
-		     , PRODUCT_NO
-		     , PRODUCT_CODE
-		     , ITEM_QTY
-		     , ITEM_PRICE
-		     , OPT_ADD_PRICE
-		     , DISP_ORD
-		     , ORD_AMT
-		     , #{cnclRtnAmt}
-		     , #{cpn1DcAmt}
-		     , #{tmtb1DcAmt}
-		     , #{tmtb2DcAmt}
-		     , #{goodsCpnDcAmt}
-		     , #{cartCpnDcAmt}
-		     , #{pntDcAmt}
-		     , #{prePntDcAmt}
-		     , #{savePntAmt}
-		     , #{realOrdAmt}
-		     , #{gfcdUseAmt}
-		     , REG_NO
-		     , REG_DT
-		     , UPD_NO
-		     , UPD_DT
-		  FROM TB_ORDER_DETAIL_ITEM
-		 WHERE 1 = 1
-		   AND ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
-	</insert>
-
-	<!-- 주문상세단품이력정보 등록 -->
-	<insert id="createOrderDetailItemHstTemp" parameterType="Order">
 		/* OrderChange.createOrderDetailItemHstTemp */
 		INSERT INTO TB_ORDER_DETAIL_ITEM_HST (
 		       ORD_DTL_ITEM_SQ
@@ -811,53 +714,10 @@
 		 WHERE ORD_CHG_SQ = #{ordChgSq}
 		   AND ORD_DTL_NO = #{ordDtlNo}
 	</insert>
-	
-	<!-- 주문상세정보 수정 -->
-	<update id="updateOrderDetail" parameterType="Order">
-		/* OrderChange.updateOrderDetail */
-		UPDATE TB_ORDER_DETAIL OD
-		 INNER JOIN (
-		    SELECT ODI.ORD_DTL_NO
-		         , SUM(ODI.CNCL_RTN_AMT)     AS CNCL_RTN_AMT
-		         , SUM(ODI.CPN1_DC_AMT)      AS CPN1_DC_AMT
-		         , SUM(ODI.TMTB1_DC_AMT)     AS TMTB1_DC_AMT
-		         , SUM(ODI.TMTB2_DC_AMT)     AS TMTB2_DC_AMT
-		         , SUM(ODI.GOODS_CPN_DC_AMT) AS GOODS_CPN_DC_AMT
-		         , SUM(ODI.CART_CPN_DC_AMT)  AS CART_CPN_DC_AMT
-		         , SUM(ODI.PNT_DC_AMT)       AS PNT_DC_AMT
-		         , SUM(ODI.PRE_PNT_DC_AMT)   AS PRE_PNT_DC_AMT
-		         , SUM(ODI.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
-		         , SUM(ODI.REAL_ORD_AMT)     AS REAL_ORD_AMT
-		         , SUM(ODI.GFCD_USE_AMT)     AS GFCD_USE_AMT
-		      FROM TB_ORDER_DETAIL_ITEM ODI
-		     WHERE ODI.ORD_NO = #{ordNo}
-		       AND ODI.ORD_DTL_NO = #{ordDtlNo}
-		     GROUP BY ODI.ORD_DTL_NO
-		 ) Z
-		    ON OD.ORD_DTL_NO = Z.ORD_DTL_NO
-		   SET OD.ORD_DTL_STAT     = CASE WHEN OD.ORD_QTY > (OD.CNCL_RTN_QTY + #{ordCanChgQty}) THEN OD.ORD_DTL_STAT
-		                                  ELSE #{ordDtlStat}
-		                              END
-		     , OD.CNCL_RTN_QTY     = OD.CNCL_RTN_QTY + #{ordCanChgQty}
-		     , OD.CNCL_RTN_AMT     = Z.CNCL_RTN_AMT
-		     , OD.CPN1_DC_AMT      = Z.CPN1_DC_AMT
-		     , OD.TMTB1_DC_AMT     = Z.TMTB1_DC_AMT
-		     , OD.TMTB2_DC_AMT     = Z.TMTB2_DC_AMT
-		     , OD.GOODS_CPN_DC_AMT = Z.GOODS_CPN_DC_AMT
-		     , OD.CART_CPN_DC_AMT  = Z.CART_CPN_DC_AMT
-		     , OD.PNT_DC_AMT       = Z.PNT_DC_AMT
-		     , OD.PRE_PNT_DC_AMT   = Z.PRE_PNT_DC_AMT
-		     , OD.SAVE_PNT_AMT     = Z.SAVE_PNT_AMT
-		     , OD.REAL_ORD_AMT     = Z.REAL_ORD_AMT
-		     , OD.GFCD_USE_AMT     = Z.GFCD_USE_AMT
-		 WHERE 1 = 1
-		   AND OD.ORD_NO = #{ordNo}
-		   AND OD.ORD_DTL_NO = #{ordDtlNo}
-	</update>
 
 	<!-- 주문상세단품정보 수정 -->
-	<update id="updateOrderDetailTemp" parameterType="Order">
-		/* OrderChange.updateOrderDetailTemp */
+	<update id="updateOrderDetail" parameterType="Order">
+		/* OrderChange.updateOrderDetail */
 		UPDATE TB_ORDER_DETAIL OD
 		   SET OD.ORD_DTL_STAT     = CASE WHEN OD.ORD_QTY > (OD.CNCL_RTN_QTY + #{ordCanChgQty}) THEN OD.ORD_DTL_STAT
 		                                  ELSE #{ordDtlStat}
@@ -879,7 +739,7 @@
 		 WHERE OD.ORD_NO = #{ordNo}
 		   AND OD.ORD_DTL_NO = #{ordDtlNo}
 	</update>
-	
+
 	<!-- 주문상세이력정보 (취소,반품) 등록 -->
 	<insert id="createOrderDetailHstCnclRtn" parameterType="Order">
 		/* OrderChange.createOrderDetailHstCnclRtn */
@@ -956,176 +816,6 @@
 		     , UPD_NO
 		     , UPD_DT
 		)
-		SELECT OD.ORD_DTL_NO
-		     , OD.ORD_NO
-		     , OD.ORD_EXCH_GB
-		     , #{ordDtlStat}
-		     , 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
-		     , Z.ORD_AMT
-		     , #{ordCanChgQty}
-		     , OD.ORD_AMT
-		     , OD.CPN1_CPN_SQ
-		     , OD.CPN1_DC_AMT - Z.CPN1_DC_AMT
-		     , OD.TMTB1_SQ
-		     , OD.TMTB1_DC_AMT - Z.TMTB1_DC_AMT
-		     , OD.TMTB2_SQ
-		     , OD.TMTB2_DC_AMT - Z.TMTB2_DC_AMT
-		     , OD.GOODS_CPN_SQ
-		     , OD.GOODS_CPN_DC_AMT - Z.GOODS_CPN_DC_AMT
-		     , OD.CART_CPN_SQ
-		     , OD.CART_CPN_DC_AMT - Z.CART_CPN_DC_AMT
-		     , OD.BURDEN_RATE
-		     , OD.PNT_DC_AMT - Z.PNT_DC_AMT
-		     , OD.PRE_PNT_DC_AMT - Z.PRE_PNT_DC_AMT
-		     , OD.SAVE_PNT_AMT - Z.SAVE_PNT_AMT
-		     , Z.REAL_ORD_AMT
-		     , OD.GFCD_USE_AMT - Z.GFCD_USE_AMT
-		     , OD.VENDOR_ID
-		     , OD.EXTMALL_ID
-		     , OD.AGENT_ORDER_ID
-		     , OD.EXTMALL_ORDER_ID
-		     , OD.CHANGEABLE_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}            AS REG_ID
-		     , NOW()               AS REG_DT
-		     , #{regNo}            AS REG_ID
-		     , NOW()               AS UPD_DT
-		  FROM TB_ORDER_DETAIL OD
-		 INNER JOIN (
-		      SELECT ODI.ORD_DTL_NO
-		           , SUM(ODI.ORD_AMT)          AS ORD_AMT
-		           , SUM(ODI.CNCL_RTN_AMT)     AS CNCL_RTN_AMT
-		           , SUM(ODI.CPN1_DC_AMT)      AS CPN1_DC_AMT
-		           , SUM(ODI.TMTB1_DC_AMT)     AS TMTB1_DC_AMT
-		           , SUM(ODI.TMTB2_DC_AMT)     AS TMTB2_DC_AMT
-		           , SUM(ODI.GOODS_CPN_DC_AMT) AS GOODS_CPN_DC_AMT
-		           , SUM(ODI.CART_CPN_DC_AMT)  AS CART_CPN_DC_AMT
-		           , SUM(ODI.PNT_DC_AMT)       AS PNT_DC_AMT
-		           , SUM(ODI.PRE_PNT_DC_AMT)   AS PRE_PNT_DC_AMT
-		           , SUM(ODI.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
-		           , SUM(ODI.REAL_ORD_AMT)     AS REAL_ORD_AMT
-		           , SUM(ODI.GFCD_USE_AMT)     AS GFCD_USE_AMT
-		        FROM TB_ORDER_DETAIL_ITEM ODI
-		       WHERE ODI.ORD_DTL_NO = #{ordDtlNo}
-		       GROUP BY ODI.ORD_DTL_NO
-		 ) Z
-		    ON OD.ORD_DTL_NO = Z.ORD_DTL_NO
-		   AND OD.ORD_DTL_NO = #{ordDtlNo}
-	</insert>
-
-	<!-- 주문상세이력정보 (취소,반품) 등록 -->
-	<insert id="createOrderDetailHstCnclRtnTemp" parameterType="Order">
-		/* OrderChange.createOrderDetailHstCnclRtnTemp */
-		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
-		     , CHANGEABLE_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