Sfoglia il codice sorgente

Merge branch 'ST24PRJ-491' into develop

card007 4 anni fa
parent
commit
9d95be4bd9

+ 13 - 2
src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -1765,7 +1765,10 @@
 	<select id="getDeliveryAddrList" parameterType="Order" resultType="Order">
 		/* order.getDeliveryAddrList */
 		SELECT Z.DELV_ADDR_SQ
+		     , Z.GIFT_PACK_YN
+		     , Z.GIFT_ADDR_INP_YN
 		     , Z.EXCH_GB_NM
+		     , Z.GIFT_LIMIT_DT
 		     , Z.RECIP_NM
 		     , Z.RECIP_PHNNO
 		     , Z.RECIP_TELNO
@@ -1778,10 +1781,15 @@
 		     , Z.ORD_NO
 		  FROM (SELECT OD.DELV_ADDR_SQ
 		             , OD.ORD_EXCH_GB
-		             , CASE WHEN OD.ORD_EXCH_GB = 'O'
-		                    THEN '주문'
+		             , OD.GIFT_PACK_YN
+		             , OD.GIFT_ADDR_INP_YN
+		             , CASE WHEN OD.ORD_EXCH_GB = 'O' AND OD.GIFT_PACK_YN = 'Y' THEN '선물'
+		                    WHEN OD.ORD_EXCH_GB = 'O' AND OD.GIFT_PACK_YN = 'N' THEN '주문'
 		                    ELSE '교환'
 		               END EXCH_GB_NM
+		             , CASE WHEN OD.GIFT_PACK_YN = 'Y' AND OD.GIFT_ADDR_INP_YN = 'N' THEN O.ORD_DT + INTERVAL 3 DAY
+		                    ELSE DA.UPD_DT
+		                END AS GIFT_LIMIT_DT
 		             , DA.RECIP_NM
 		             , DA.RECIP_PHNNO
 		             , DA.RECIP_TELNO
@@ -1802,7 +1810,10 @@
 		           AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_97'			-- 교환철회 상품 제외
 		       ) Z
 		 GROUP BY Z.DELV_ADDR_SQ
+		     , Z.GIFT_PACK_YN
+		     , Z.GIFT_ADDR_INP_YN
 		     , Z.EXCH_GB_NM
+		     , Z.GIFT_LIMIT_DT
 		     , Z.RECIP_NM
 		     , Z.RECIP_PHNNO
 		     , Z.RECIP_TELNO