주문목록화면컬럼정보수정

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

@@ -221,6 +221,8 @@
 		                 , A.RETURNABLE_YN
 		                 , A.CHANGEABLE_YN
 		                 , A.BRAND_GROUP_NM
+		                 , A.EXTMALL_NM
+		                 , A.SHIP_COMP_NM
 		              FROM (SELECT O.ORD_NO
 		                         , OD.ORD_DTL_NO
 		                         , ODI.ORD_DTL_ITEM_SQ
@@ -265,7 +267,7 @@
 		                         , OD.FORMAL_GB
 		                         , DATE_FORMAT(OD.DELV_ASSIGN_DT,'%Y%m%d%H%i%S') AS DELV_ASSIGN_DT
 		                         , OD.INVOICE_NO
-		                         , OD.DELV_STDT
+		                         , DATE_FORMAT(OD.DELV_STDT,'%Y%m%d%H%i%S') AS DELV_STDT
 		                         , OD.SOLDOUT_YN
 		                         , OD.SOLDOUT_MEMO
 		                         , DATE_FORMAT(OD.SOLDOUT_REG_DT,'%Y%m%d%H%i%S') AS SOLDOUT_REG_DT
@@ -290,6 +292,12 @@
 		                            WHERE  1=1
 		                            AND    BR.BRAND_CD = G1.BRAND_CD
 		                            AND    BG.USE_YN = 'Y') AS BRAND_GROUP_NM
+		                         , (SELECT EXTMALL_NM
+		                            FROM   TB_EXTMALL EX
+		                            WHERE  EX.EXTMALL_ID = OD.EXTMALL_ID) AS EXTMALL_NM
+		                         , (SELECT SHIP_COMP_NM
+		                            FROM   TB_SHIP_COMPANY SC
+		                            WHERE  SC.SHIP_COMP_CD = OD.SHIP_COMP_CD) AS SHIP_COMP_NM
 		                      FROM TB_ORDER O
 		                     INNER JOIN TB_ORDER_DETAIL OD
 		                        ON O.ORD_NO = OD.ORD_NO
@@ -484,6 +492,8 @@
 		                       , A.RETURNABLE_YN
 		                       , A.CHANGEABLE_YN
 		                       , A.BRAND_GROUP_NM
+		                       , A.EXTMALL_NM
+		                       , A.SHIP_COMP_NM
 		           ) Z
 		           JOIN (SELECT @rownum := 0) R
 		           ORDER BY Z.ORD_NO DESC

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

@@ -3882,8 +3882,6 @@
 		     , Z.SELF_GOODS_YN
 		     , Z.GOODS_NM
 		     , Z.GOODS_TYPE
-		     , Z.PRICE_ORG
-		     , Z.PRICE_SALE
 		     , Z.ADD_PAY_COST
 		     , Z.SYS_IMG_NM
 		     , Z.GIFT_PACK_YN
@@ -3943,8 +3941,6 @@
 		           , ODI.ORD_DTL_ITEM_SQ
 		           , ODI.OPT_CD1
 		           , ODI.OPT_CD2
-		           , ROUND((ODH.ORD_AMT - ODH.CPN1_DC_AMT) * (OCD.CHG_QTY / ODH.ORD_QTY)) AS PRICE_ORG
-		           , ROUND((ODH.REAL_ORD_AMT + ODH.PNT_DC_AMT + ODH.GFCD_USE_AMT) * (OCD.CHG_QTY / OD.ORD_QTY)) AS PRICE_SALE
 		           , OC.ADD_PAY_COST
 		           , 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
@@ -3987,9 +3983,6 @@
 		          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_ORDER_DETAIL_HST ODH
-		          ON OD.ORD_DTL_NO = ODH.ORD_DTL_NO
-		         AND ODH.ORD_DTL_STAT = 'G013_00'
 		       INNER JOIN TB_GOODS G1
 		          ON OD.GOODS_CD = G1.GOODS_CD
 		       INNER JOIN TB_GOODS G2
@@ -4026,7 +4019,7 @@
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.ORD_DATE, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_DT, Z.COMPLETE_DT, Z.CHG_STAT
 		        , Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE
-		        , Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.DELV_FEE_CD, Z.SUPPLY_COMP_NM, Z.ORD_NM, Z.CUST_NO, Z.ORD_EMAIL
+		        , Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.DELV_FEE_CD, Z.SUPPLY_COMP_NM, Z.ORD_NM, Z.CUST_NO, Z.ORD_EMAIL
 		        , Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT, Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT
 		        , Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT, Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_TID, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM
 		 ORDER BY Z.ORD_CHG_SQ DESC, Z.SELF_GOODS_YN DESC, Z.DELV_FEE_CD