제휴몰검색

src/main/java/com/style24/batch/biz/job/delivery/TsbWithdrawRequestJob.java

@@ -82,10 +82,12 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 			
 			if (!ordChgSqChk.equals(wmsData.getOrderexceptionno()+"")) {
 				
-				if ("Y".equals(wmsData.getRecallrequestyn())) { // 회수요청일경우 
+				if ("Y".equals(wmsData.getRecallrequestyn())) { // 회수요청일경우
+					
 					// 알림톡  문구 조회 
 					try {
 						Delivery info = deliveryService.getWithdrawStart(wmsData);
+						
 						// 알림톡 발송 
 						Order order = new Order();
 						order.setOrdNo(info.getOrdNo());
@@ -97,7 +99,7 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 						order.setGoodsNm(info.getGoodsNm());
 						
 						kakaotalkService.sendWithdrawStart(order,TsbConstants.REG_NO);
-					}catch(Exception e) {
+					} catch(Exception e) {
 						log.debug("회수시작 알림톡 Exception: "+e.getStackTrace().toString());
 					}
 				}

src/main/java/com/style24/batch/biz/service/TsbWmsDeliveryService.java

@@ -404,10 +404,8 @@ public class TsbWmsDeliveryService {
 	 */
 	@Transactional("wmsTxnManager")
 	public void insertWmsRecallDeliveryItem(Delivery data, Integer recallNo) {
-		
 		data.setRecallno(recallNo);
 		wmsDeliveryDao.insertWmsRecallDeliveryItem(data);
-
 	}
 	
 	

src/main/java/com/style24/persistence/domain/Delivery.java

@@ -162,8 +162,7 @@ public class Delivery extends TscBaseDomain {
 	
 	private String cjOrdChgSq;
 	private String cjOrdNo;
-	
-	
+
 	private Integer recallexceptionno;
 	private Integer recallexceptionitemno;
 	private Integer recallexceptionmemono;
@@ -230,6 +229,7 @@ public class Delivery extends TscBaseDomain {
 	private String extmallId;
 	private String agentOrderId;
 	private String extmallOrderId;
+	private String chgRegDt;
 }
 
 

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

@@ -1138,7 +1138,7 @@
 		  FROM TB_ORD_FREEGIFT     A
 		  JOIN TB_ORD_FREEGIFT_VAL C ON A.ORD_FREEGIFT_SQ = C.ORD_FREEGIFT_SQ
 		  JOIN TB_ORDER            O ON A.ORD_NO = O.ORD_NO 
-		  WHERE A.ORD_NO = #{ordNo} 
+		  WHERE A.ORD_NO = #{ordNo}
 	</select>
 
 	<!-- WMS 회수요청 대상 조회      -->	
@@ -1183,6 +1183,7 @@
 	         , C.EXTMALL_ID
 	         , C.AGENT_ORDER_ID
 	         , C.EXTMALL_ORDER_ID
+	         , B.REG_DT AS CHG_REG_DT
 	      FROM TB_ORDER_CHANGE        A 
 	      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 	      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
@@ -1234,6 +1235,7 @@
 	         , C.EXTMALL_ID
 	         , C.AGENT_ORDER_ID
 	         , C.EXTMALL_ORDER_ID
+	         , B.REG_DT AS CHG_REG_DT
 	      FROM TB_ORDER_CHANGE        A 
 	      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 	      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
@@ -1287,6 +1289,7 @@
 	         , C.EXTMALL_ID
 	         , C.AGENT_ORDER_ID
 	         , C.EXTMALL_ORDER_ID 
+	         , B.REG_DT AS CHG_REG_DT
 	      FROM TB_ORDER_CHANGE        A 
 	      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 	      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
@@ -1341,6 +1344,7 @@
 	         , C.EXTMALL_ID
 	         , C.AGENT_ORDER_ID
 	         , C.EXTMALL_ORDER_ID 
+	         , B.REG_DT AS CHG_REG_DT
 	      FROM TB_ORDER_CHANGE        A 
 	      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 	      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
@@ -1370,8 +1374,7 @@
 		  AND ORD_DTL_NO = #{orderdtlno}
 		  AND CHG_STAT IN ('G685_20','G685_50')
 	</update>			
-		
-  		
+
 	<!-- 주문변경상세  반운송장번호 업데이트   -->
 	<update id="updateTbOrderChaneInvoc" parameterType="Delivery"  >
 		/*TsbDelivery.updateTbOrderChaneInvoc*/
@@ -1873,23 +1876,26 @@
 	
 	<!-- 회수시작 알림문구 조회  -->	
 	<select id="getWithdrawStart" resultType="Delivery">
-		/*TsbDelivery.getWithdrawStart*/
-		SELECT
-			  D.ORD_NO 
-			, D.CUST_NO 
-			, A.CHGER_PHNNO AS ORD_PHNNO
-			, A.CHGER_NM    AS ORD_NM
-			, CONCAT(A.CHGER_BASE_ADDR ,' ',A.CHGER_DTL_ADDR)                  AS CHGER_BASE_ADDR 
-			, (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
-			, COUNT(C.GOODS_CD) -1                                             AS GOODS_CNT
-			, A.MALL_GB
+		/* TsbDelivery.getWithdrawStart */
+		SELECT D.ORD_NO 
+		     , D.CUST_NO 
+		     , A.CHGER_PHNNO AS ORD_PHNNO
+		     , A.CHGER_NM    AS ORD_NM
+		     , CONCAT(A.CHGER_BASE_ADDR ,' ',A.CHGER_DTL_ADDR)                  AS CHGER_BASE_ADDR 
+		     , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD= MAX(C.GOODS_CD))  AS GOODS_NM
+		     , COUNT(C.GOODS_CD) -1                                             AS GOODS_CNT
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C        ON B.ORD_DTL_NO = C.ORD_DTL_NO 
 		  JOIN TB_ORDER        D        ON C.ORD_NO     = D.ORD_NO 
 		 WHERE A.ORD_CHG_SQ = #{orderexceptionno}
 		   AND B.DEL_YN ='N'
-		 GROUP BY D.ORD_NO, D.CUST_NO, A.CHGER_PHNNO, A.CHGER_NM, A.CHGER_BASE_ADDR, A.CHGER_DTL_ADDR 
+		 GROUP BY D.ORD_NO
+		     , D.CUST_NO
+		     , A.CHGER_PHNNO
+		     , A.CHGER_NM
+		     , A.CHGER_BASE_ADDR
+		     , A.CHGER_DTL_ADDR 
 	</select>	
 		
 	<!-- 주문상세번호 조회 -->	

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsDelivery.xml

@@ -549,10 +549,11 @@
 			, InvoiceNo			-- 원운송장번호
 			, IfStat			-- I/F상태
 			, IfDate
-			, vendorId			-- 외부몰 벤더
-			, extmallId			-- 외부몰 
-			, agentOrderId		-- 에이젼트주문번호
-			, extmallOrderId	-- 외부몰주문번호
+			, VENDOR_ID			-- 외부몰 벤더
+			, EXTMALL_ID		-- 외부몰 
+			, AGENT_ORDER_ID	-- 에이젼트주문번호
+			, EXTMALL_ORDER_ID	-- 외부몰주문번호
+			, CHG_REG_DT        -- 클레임접수일
 		)
 		VALUES
 		(
@@ -576,6 +577,7 @@
 			, #{extmallId}
 			, #{agentOrderId}
 			, #{extmallOrderId}
+			, #{chgRegDt}
 		)
 	</insert>