فهرست منبع

샵링커 주문수집메뉴-GS 목록 나오게로 다시 원복

jmh 4 سال پیش
والد
کامیت
0b974eea65
1فایلهای تغییر یافته به همراه3 افزوده شده و 8 حذف شده
  1. 3 8
      src/main/java/com/style24/persistence/mybatis/shop/TsaShoplinker.xml

+ 3 - 8
src/main/java/com/style24/persistence/mybatis/shop/TsaShoplinker.xml

@@ -480,7 +480,6 @@
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
-            AND A.MALL_ID != 'APISHOP_0021'
             <include refid="getSlkOrderListCondition_sql"/>
             <include refid="getSlkOrderListCondition_sql"/>
             
             
 			UNION ALL 
 			UNION ALL 
@@ -533,9 +532,7 @@
 				, B.DELV_ADDR_SQ
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
 				, B.REG_DT AS EXTMALL_REG_DT
 			FROM 
 			FROM 
-				TB_EXTMALL_ORDER_UPLOAD B
-				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
-				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID AND A.MALL_ID != 'APISHOP_0021' 
+				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
@@ -608,7 +605,6 @@
 				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
-            AND A.MALL_ID != 'APISHOP_0021'
             <include refid="getSlkOrderListCondition_sql"/>
             <include refid="getSlkOrderListCondition_sql"/>
             
             
 			UNION ALL 
 			UNION ALL 
@@ -669,7 +665,7 @@
 			FROM 
 			FROM 
 				TB_EXTMALL_ORDER_UPLOAD B 
 				TB_EXTMALL_ORDER_UPLOAD B 
 				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
 				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
-				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID AND A.MALL_ID != 'APISHOP_0021'
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
@@ -840,7 +836,6 @@
 				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
-            AND A.MALL_ID != 'APISHOP_0021'
             <include refid="getSlkOrderListCondition_sql"/>
             <include refid="getSlkOrderListCondition_sql"/>
             
             
 			UNION ALL 
 			UNION ALL 
@@ -901,7 +896,7 @@
 			FROM 
 			FROM 
 				TB_EXTMALL_ORDER_UPLOAD B 
 				TB_EXTMALL_ORDER_UPLOAD B 
 				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
 				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
-				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID AND A.MALL_ID != 'APISHOP_0021'
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')