浏览代码

배송정보개발

tsit14 4 年之前
父节点
当前提交
befcc7290a

+ 9 - 0
src/main/java/com/style24/core/biz/dao/TscOrderDao.java

@@ -911,4 +911,13 @@ public interface TscOrderDao {
 	 * @since  2021. 05. 28
 	 */
 	void createNaverPayErrorLog(Order param);
+	
+	/**
+	 * 스윗트래커 정보 조회
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 06. 17
+	 */
+	Collection<Order> getSweetTrackerDeliveryInfo(Order order);
 }

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

@@ -2847,6 +2847,17 @@ public class TscOrderService {
 		return orderDao.getCustPaymeans(order);
 	}
 	
+	/**
+	 * 스윗트래커 정보 조회
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 06. 17
+	 */
+	public Collection<Order> getSweetTrackerDeliveryInfo(Order order) {
+		return orderDao.getSweetTrackerDeliveryInfo(order);
+	}
+	
 	
 	
 	

+ 8 - 0
src/main/java/com/style24/persistence/domain/Order.java

@@ -105,6 +105,7 @@ public class Order extends TscBaseDomain {
 	private String foreignYn;						// 해외구매대행여부
 
 	private String delvLocCd;						// 출고처코드
+	private String delvLocNm;						// 출고처코드명
 	private String delvAssigngDt;					// 출고처지정일자
 	private String delvAddignStat;					// 출고처지정상태
 	private String dstrbtMemo;						// 출고메모
@@ -741,4 +742,11 @@ public class Order extends TscBaseDomain {
 	private String addDeliveryFeeYn;
 	private int addDeliveryFee;	
 	private String wdBfSendYn;
+	
+	// 2021.06.17 스윗트래커 정보 조회
+	private String timeTrans;
+	private String delvWhere;
+	private String details;
+	private String telno;
+	
 }

+ 31 - 0
src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -636,6 +636,9 @@
 		     , A.DELV_FEE_CD
 		     , A.DELV_FEE_CD_GRP
 		     , A.BRAND_GROUP_NM
+		     , A.SHIP_COMP_CD
+		     , A.SHIP_COMP_NM
+		     , A.DELV_LOC_NM
 		FROM (
 		    SELECT OD.ORD_NO
 		         , CASE WHEN OD.ORD_EXCH_GB = 'O'
@@ -714,6 +717,15 @@
 		                THEN BG.BRAND_GROUP_ENM
 		                ELSE BG.BRAND_GROUP_KNM
 		                END  BRAND_GROUP_NM
+		         , OD.SHIP_COMP_CD
+		         , (SELECT SHIP_COMP_NM
+		            FROM   TB_SHIP_COMPANY SC
+		            WHERE  SC.SHIP_COMP_CD = OD.SHIP_COMP_CD) AS SHIP_COMP_NM
+		         , (SELECT DL.DELV_LOC_NM
+		            FROM   TB_DELIVERY_LOC DL
+		            WHERE  DL.DELV_LOC_CD = OD.DELV_LOC_CD
+		            AND    DL.USE_YN = 'Y'
+		            LIMIT  1) AS DELV_LOC_NM
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
 		        ON O.ORD_NO = OD.ORD_NO
@@ -814,6 +826,9 @@
 		     , A.DELV_FEE_CD
 		     , A.DELV_FEE_CD_GRP
 		     , A.BRAND_GROUP_NM
+		     , A.SHIP_COMP_CD
+		     , A.SHIP_COMP_NM
+		     , A.DELV_LOC_NM
 		 ORDER BY A.ORD_NO
 		     , A.ORD_DTL_NO DESC
 	</select>
@@ -4342,4 +4357,20 @@
 			 , NOW()
 			 )
 	</insert>
+	
+	<!-- 2021.06.17 스윗트래커 정보 조회 -->
+	<select id="getSweetTrackerDeliveryInfo" parameterType="Order" resultType="Order">
+		/* TscOrder.getSweetTrackerDeliveryInfo */
+		SELECT TIME_TRANS
+		     , DELV_WHERE
+		     , DETAILS
+		     , IFNULL(TELNO_MAN, TELNO_OFFICE) AS TELNO
+		  FROM TB_SWEET_TRACKER
+		 WHERE SHIP_COMP_CD = (SELECT SWT_SHIP_COMP_CD
+		                         FROM TB_SHIP_COMPANY
+		                        WHERE SHIP_COMP_CD = #{shipCompCd}
+		                          AND USE_YN = 'Y')
+		   AND INVOICE_NO = #{invoiceNo}
+		 ORDER BY DELV_LEVEL DESC
+	</select>
 </mapper>