Merge branch 'style' into develop

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

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

@@ -39,7 +39,6 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 
 	@Override
 	public Collection<Delivery> read() throws Exception {
-
 		// 1.mall 회수대상 조회
 		Collection<Delivery> reqList = deliveryService.getWithdrawRequestList();
 		return reqList;
@@ -49,19 +48,17 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 	public Collection<Delivery> process(Collection<Delivery> reqList) throws Exception {
 		succCnt = 0;
 		failCnt = 0;
+		
 		/**
 		 * 1.mall 회수대상 조회  
 		 * 2.wms  회수정보 등록 
-		 * 3.mall 회수상태 업데이트   G685_30 -- 회수요청 , 
-		 *  
-		 * */
-		
+		 * 3.mall 회수상태 업데이트   G685_30 -- 회수요청 ,  
+		 */
 		Integer recallNo = 0;
 		String ordChgSq  = "";
 		for(Delivery wmsData : reqList) {
 			// 2.wms  회수정보 등록 
-			
-			if(!ordChgSq.equals(wmsData.getOrderexceptionno()+"") ) {
+			if (!ordChgSq.equals(wmsData.getOrderexceptionno()+"")) {
 				recallNo = wmsDeliveryService.insertWmsRecallDelivery(wmsData);
 				ordChgSq = wmsData.getOrderexceptionno()+"";
 			}
@@ -69,8 +66,7 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 			wmsDeliveryService.insertWmsRecallDeliveryItem(wmsData, recallNo);
 		}
 		
-		
-		for(Delivery data : reqList) {
+		for (Delivery data : reqList) {
 			// 3.mall 회수상태 업데이트   G685_30 -- 회수요청
 			try {
 				deliveryService.updateTbOrderChaneDetailStat(data);
@@ -82,14 +78,16 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 		
 		// 4. 알림톡  - 회수요청만 보냄  직접발송, 제휴몰자동수거 제외
 		String ordChgSqChk  = "";
-		for(Delivery wmsData : reqList) {
+		for (Delivery wmsData : reqList) {
 			
-			if(!ordChgSqChk.equals(wmsData.getOrderexceptionno()+"") ) {
+			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());
@@ -101,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;
@@ -224,6 +223,13 @@ public class Delivery extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private Integer[] ordDtlNoArr;
+	
+	// 2021.11.17 WMS_IF 테이블에 등록하기 위해서 추가
+	private String vendorId;
+	private String extmallId;
+	private String agentOrderId;
+	private String extmallOrderId;
+	private String chgRegDt;
 }
 
 

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

@@ -754,9 +754,9 @@
 		     , SECEDE_DT
 		     , RM_DORMANT_DT
 		     , BIRTH_MM
-		     , BANK_CD
-		     , ACCOUNT_NO
-		     , ACCOUNT_NM
+		     -- , BANK_CD
+		     -- , ACCOUNT_NO
+		     -- , ACCOUNT_NM
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -803,15 +803,15 @@
 		     , C.SECEDE_DT
 		     , C.RM_DORMANT_DT
 		     , C.BIRTH_MM
-		     , CA.BANK_CD
-		     , CA.ACCOUNT_NO
-		     , CA.ACCOUNT_NM
+		     -- , CA.BANK_CD
+		     -- , CA.ACCOUNT_NO
+		     -- , CA.ACCOUNT_NM
 		     , #{regNo}   AS REG_NO
 		     , NOW()      AS REG_DT
 		     , C.UPD_NO
 		     , C.UPD_DT
 		FROM   TB_CUSTOMER C
-		LEFT OUTER JOIN TB_CUST_ACCOUNT CA ON C.CUST_NO = CA.CUST_NO
+		-- LEFT OUTER JOIN TB_CUST_ACCOUNT CA ON C.CUST_NO = CA.CUST_NO
 		WHERE  C.CUST_NO IN (
 		                     SELECT CGH.CUST_NO
 		                     FROM   TB_CUST_GRADE_HST CGH

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 회수요청 대상 조회      -->	
@@ -1374,8 +1374,7 @@
 		  AND ORD_DTL_NO = #{orderdtlno}
 		  AND CHG_STAT IN ('G685_20','G685_50')
 	</update>			
-		
-  		
+
 	<!-- 주문변경상세  반운송장번호 업데이트   -->
 	<update id="updateTbOrderChaneInvoc" parameterType="Delivery"  >
 		/*TsbDelivery.updateTbOrderChaneInvoc*/
@@ -1877,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>	
 		
 	<!-- 주문상세번호 조회 -->	
@@ -1908,4 +1910,4 @@
 
 	</select>
 	
-</mapper>
+</mapper>

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

@@ -530,7 +530,7 @@
 	
 	<!-- 회수요청 D     -->
 	<insert id="insertWmsRecallDeliveryItem" parameterType="Delivery" useGeneratedKeys="true" keyProperty="recallitemno" >
-		/*TsbWmsDelivery."insertWmsRecallDeliveryItem"*/
+		/* TsbWmsDelivery.insertWmsRecallDeliveryItem */
 		INSERT INTO iSTYLE24_WmsIf.dbo.TB_IF_RecallDeliveryItem
 		(
 			  RecallNo			-- 반품 번호
@@ -549,6 +549,11 @@
 			, InvoiceNo			-- 원운송장번호
 			, IfStat			-- I/F상태
 			, IfDate
+			, VENDOR_ID			-- 외부몰 벤더
+			, EXTMALL_ID		-- 외부몰 
+			, AGENT_ORDER_ID	-- 에이젼트주문번호
+			, EXTMALL_ORDER_ID	-- 외부몰주문번호
+			, CHG_REG_DT        -- 클레임접수일
 		)
 		VALUES
 		(
@@ -568,8 +573,12 @@
 			, #{invoiceno}			-- 원운송장번호
 			, #{ifstat}				-- i/f상태
 			, GETDATE()				-- i/f일자
+			, #{vendorId}
+			, #{extmallId}
+			, #{agentOrderId}
+			, #{extmallOrderId}
+			, #{chgRegDt}
 		)
-
 	</insert>
 		
 	<!-- 회수 송장번호 업데이트    -->