Merge branch 'develop' into jsshin

pom.xml

@@ -96,6 +96,40 @@
 	</dependencies>
 	
 	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copyCore</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>
+										${basedir}/../style24.core/target/classes
+									</directory>
+									<filtering>
+										false
+									</filtering>
+									<includes>
+										<include>**/*</include>
+									</includes>
+								</resource>
+							</resources>
+							<outputDirectory>
+								${basedir}/target/classes
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 		<finalName>${project.name}</finalName>
 		<resources>
 			<resource>

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

@@ -50,15 +50,15 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		 * */
 		
 		// 1. (일반,예약) 품절취소대상 주문번호 목록 조회, 주문번호 단위  주문상세목록 조회 , 주문번호 단위 core 취소 서비스호출  
-		Collection<Delivery> ordnoList = deliveryService.getSoldoutOrderNoList();
-		try {
-			for(Delivery data : ordnoList) {
-				deliveryService.SoldoutCancel(data,"N");
-				succCnt++;
-			}
-		}catch(Exception E) {
-			failCnt++;
-		}
+//		Collection<Delivery> ordnoList = deliveryService.getSoldoutOrderNoList();
+//		try {
+//			for(Delivery data : ordnoList) {
+//				deliveryService.SoldoutCancel(data,"N");
+//				succCnt++;
+//			}
+//		}catch(Exception E) {
+//			failCnt++;
+//		}
 		
 		// 2. (출고예외 -- 재고부족)               품절 대상 조회     core 취소 서비스호출  처리완료 업데이트 
 		Collection<Delivery> excOrdnoList = deliveryService.getSoldoutOrderExcNoList();
@@ -72,15 +72,15 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		}
 		
 		// 3. (회수예외 -- 확정전 품절, 확정전 불량 )   품절 대상 조회    core 취소 서비스호출   처리완료 업데이트 
-		Collection<Delivery> recallOrdnoList = deliveryService.getSoldoutOrderRecallNoList();
-		try {
-			for(Delivery data3 : recallOrdnoList) {
-				deliveryService.SoldoutCancel(data3,"R");
-				succCnt++;
-			}
-		} catch(Exception E) {
-			failCnt++;
-		}
+//		Collection<Delivery> recallOrdnoList = deliveryService.getSoldoutOrderRecallNoList();
+//		try {
+//			for(Delivery data3 : recallOrdnoList) {
+//				deliveryService.SoldoutCancel(data3,"R");
+//				succCnt++;
+//			}
+//		} catch(Exception E) {
+//			failCnt++;
+//		}
 
 		 return delivery;
 	}

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

@@ -48,14 +48,14 @@ public class TsbSweetTrackerJob extends TsbAbstractJob<Collection<Delivery>, Col
 		 * 
 		 * */
 		
-		for(Delivery data : invcList) {
-			GagaMap rtn = deliveryService.sweetTrackerInvcSend(data);
-			if("S".equals(rtn.getString("success"))) {
-				deliveryService.updateOrdInvcSendYn(data);
-			}
-		}
+//		for(Delivery data : invcList) {
+//			GagaMap rtn = deliveryService.sweetTrackerInvcSend(data);
+//			if("S".equals(rtn.getString("success"))) {
+//				deliveryService.updateOrdInvcSendYn(data);
+//			}
+//		}
 		
-//		GagaMap rtn = deliveryService.sweetTrackerInvcSendTest();
+		GagaMap rtn = deliveryService.sweetTrackerInvcSendTest();
 //		log.info(""+rtn.getString("success"));
 		 succCnt = 1;
 		 failCnt = 0;

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

@@ -65,7 +65,7 @@ public class TsbDeliveryService {
 	private TsbDeliveryDao deliveryDao;
 	
 	@Autowired
-	private TscOrderDao orderDao;	
+	private TscOrderDao orderDao;
 
 	@Autowired
 	private RestTemplate restTemplate;
@@ -111,16 +111,19 @@ public class TsbDeliveryService {
         
 		// 회수예외 등록 -H
 		for(Delivery excData : excList) {
+			excData.setRegNo(TsbConstants.REG_NO);
 			deliveryDao.insertTbOrderRecallException(excData);
 		}
 		
 		// 회수예외 등록 -D
 		for(Delivery itemData : itemList) {
+			itemData.setRegNo(TsbConstants.REG_NO);
 			deliveryDao.insertTbOrderRecallExceptionItem(itemData);
 		}		
 		
 		// 회수예외 등록 -M
 		for(Delivery memoData : memoList) {
+			memoData.setRegNo(TsbConstants.REG_NO);
 			deliveryDao.insertTbOrderRecallExceptionMemo(memoData);
 		}		
 				
@@ -280,6 +283,7 @@ public class TsbDeliveryService {
 			ordChg.setUpdNo(0);
 			ordChg.setOrdChgSq(delivery.getOrdChgSq()); 
 			ordChg.setOrdDtlNo(delivery.getOrderdtlno()); 
+			ordChg.setChgStat(delivery.getChgStat());
 			orderChangeDao.createOrderChangeDetailHst(ordChg);
 		}
 	}	
@@ -412,7 +416,7 @@ public class TsbDeliveryService {
 				Map data = List.get(i);
 				Delivery goods = new Delivery();
 				goods.setRegNo(TsbConstants.REG_NO);
-				goods.setSupplyCompCd(TsbConstants.COMPANY_CD_DR); // 1003 한세드립
+				goods.setSupplyCompCd(TsbConstants.COMPANY_CD_DR); // 3 한세드립
 				goods.setCdShop(data.get("CD_SHOP").toString());
 				goods.setCdStyle(data.get("CD_STYLE").toString());
 				goods.setCdColor(data.get("CD_COLOR").toString());
@@ -718,6 +722,7 @@ public class TsbDeliveryService {
 			ordChg.setUpdNo(0);
 			ordChg.setOrdChgSq(data.getOrderexceptionno()); 
 			ordChg.setOrdDtlNo(data.getOrderdtlno()); 
+			ordChg.setChgStat(data.getChgStat());
 			orderChangeDao.createOrderChangeDetailHst(ordChg);
 		}
 	}
@@ -747,7 +752,7 @@ public class TsbDeliveryService {
 		
 		for(Delivery data : list) {
 			data.setUpdNo(TsbConstants.REG_NO);
-			data.setShipCompCd("29");
+			data.setShipCompCd("D1013");
 			deliveryDao.updateTbOrderChaneInvoc(data);
 		}
 	}
@@ -776,8 +781,9 @@ public class TsbDeliveryService {
 				OrderChange ordChg = new OrderChange();
 				ordChg.setRegNo(0);
 				ordChg.setUpdNo(0);
-				ordChg.setOrdChgSq(data.getOrdChgSq());   
-				ordChg.setOrdDtlNo(data.getOrdDtlNo()); 
+				ordChg.setOrdChgSq(data.getOrdChgSq());
+				ordChg.setOrdDtlNo(data.getOrdDtlNo());
+				ordChg.setChgStat(OrderChangeStat.WITHDRAW_GOODS_CHECK.value());
 				orderChangeDao.createOrderChangeDetailHst(ordChg);
 			}
 		}
@@ -907,15 +913,15 @@ public class TsbDeliveryService {
 			param.setBankCd(item.getBankCd());
 			param.setAccountNm(item.getAccountNm());
 			param.setAccountNo(item.getAccountNo());
-			
 			param.setCnclRtnQty(item.getSaleQty());
 			ordSoldoutList.add(param);
 			
 		}
-		coreDeliveryService.cancelSoldout(ordSoldoutList,userNo);
+		coreDeliveryService.cancelSoldout(ordSoldoutList,userNo,"Y");
 		
 		if("E".equals(gubun)) {  
 			// 처리완료 업데이트 
+			data.setUpdNo(userNo);
 			deliveryDao.updateTbOrderDeliveryException(data);
 		} else if("R".equals(gubun)) {
 			// 처리완료 업데이트  
@@ -957,9 +963,9 @@ public class TsbDeliveryService {
 		
 		
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
-		params.add("num",          "237361343052");
-		params.add("code",         "08");
-		params.add("fid",          "08237361343052");
+		params.add("num",          "420693421175");
+		params.add("code",         "05");
+		params.add("fid",          "05420693421175");
 		params.add("callback_url", callBackUrl);
 		params.add("callback_type","json");
 		params.add("tier",         tier);

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

@@ -271,7 +271,7 @@ public class TsbGoodsService {
 		// 상품평-만족도점수
 		goodsSummary.setColNm1("SCORE");
 		goodsSummary.setReviewColNm("SCORE");
-		goodsSummary.setPhotoYn("");
+	//	goodsSummary.setPhotoYn("");
 		goodsDao.createGoodsSummaryByReviewSum(goodsSummary);
 		// 상품평-사이즈점수
 		goodsSummary.setColNm1("SCORE_SIZE1");

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

@@ -258,7 +258,7 @@ public class TsbWmsDeliveryService {
 	@Transactional("wmsTxnManager")
 	public void updateWmsIfRecallDeliveryRslt(Delivery delivery) {
 
-		delivery.setIfstat("2"); // 수신완료 상태 
+		delivery.setIfstat("3"); // 수신완료 상태 
 		wmsDeliveryDao.updateWmsIfRecallDeliveryRslt(delivery);
 		wmsDeliveryDao.updateWmsIfRecallDeliveryItemRslt(delivery);
 	}		
@@ -369,11 +369,12 @@ public class TsbWmsDeliveryService {
 		Integer recallNo = 0;
 		String ordChgSq  = "";
 		for(Delivery data : list) {
-			if(!ordChgSq.equals(data.getOrdChgSq()+"") ) {
+			log.info("ordChgSq: "+ordChgSq+"   :  getOrdChgSq "+data.getOrderexceptionno());
+			if(!ordChgSq.equals(data.getOrderexceptionno()+"") ) {
 				
 				wmsDeliveryDao.insertWmsRecallDelivery(data);
-				ordChgSq = data.getOrdChgSq()+"";
-				recallNo = data.getRecallno();		
+				ordChgSq = data.getOrderexceptionno()+"";
+				recallNo = data.getRecallno(); 
 			}
 			
 			data.setRecallno(recallNo);

src/main/java/com/style24/batch/biz/task/TsbCustomerTask.java

@@ -52,7 +52,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.dormant.schedule}")
+//	@Scheduled(cron = "${cron.customer.dormant.schedule}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void dormantScheduleJob() throws Exception {
@@ -66,7 +66,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.dormant.transform}")
+//	@Scheduled(cron = "${cron.customer.dormant.transform}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void dormantTransformJob() throws Exception {
@@ -80,7 +80,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.secede.process}")
+//	@Scheduled(cron = "${cron.customer.secede.process}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void secedeProcessJob() throws Exception {
@@ -94,7 +94,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.privacy.policy.notice}")
+//	@Scheduled(cron = "${cron.customer.privacy.policy.notice}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void privacyPolicyNoticeJob() throws Exception {
@@ -108,7 +108,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.marketing.agreement.notice}")
+//	@Scheduled(cron = "${cron.customer.marketing.agreement.notice}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void marketingAgreementNoticeJob() throws Exception {
@@ -122,7 +122,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.grade.change}")
+//	@Scheduled(cron = "${cron.customer.grade.change}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void gradeChangeJob() throws Exception {
@@ -135,7 +135,7 @@ public class TsbCustomerTask {
 	 * @author gagamel
 	 * @since 2021. 5. 10
 	 */
-	@Scheduled(cron = "${cron.customer.netpathy.sync}")
+//	@Scheduled(cron = "${cron.customer.netpathy.sync}")
 //	@Scheduled(fixedDelay = 360000)
 	@Async
 	public void syncronizeNetpathyMailCustomerInfo() throws Exception {

src/main/java/com/style24/batch/biz/task/TsbMarketingTask.java

@@ -72,7 +72,7 @@ public class TsbMarketingTask {
 	 * @since 2021. 04. 26
 	 */
 	//@Scheduled(cron = "${cron.marketing.expire.point}")
-	//@Scheduled(fixedDelay=360000)
+//	@Scheduled(fixedDelay=360000)
 	@Async
 	public void expirePointJob() throws Exception {
 		expirePointJob.runById("cron.marketing.expire.point");

src/main/java/com/style24/batch/biz/task/TsbSocialTask.java

@@ -2,6 +2,7 @@ package com.style24.batch.biz.task;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.style24.batch.biz.job.social.TsbSocialGoodsJob;
@@ -55,7 +56,7 @@ public class TsbSocialTask {
 	 *
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
+	@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
 	//@Scheduled(fixedDelay=360000)
 	@Async
 	public void tsbSocialGoodsJob() throws Exception {

src/main/java/com/style24/batch/support/env/TsbConstants.java

@@ -12,8 +12,8 @@ public class TsbConstants {
 	// 등록자번호
 	public static final Integer REG_NO = 0;
 	
-    public static final String COMPANY_CD_DR = "1003"; // 한세드림
-    public static final String COMPANY_CD_MK = "4337"; // 한세엠케이(주)
+    public static final String COMPANY_CD_DR = "3"; // 한세드림
+    public static final String COMPANY_CD_MK = "5"; // 한세엠케이(주)
 	   
 	// 모니터링
 	public enum Monitoring {

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

@@ -142,7 +142,10 @@ public class Delivery extends TscBaseDomain {
 	private String accountNm;
 	private String accountNo;
 	private String ordDtlNoYn;
-	
+	private String reasoncode;
+	private String csMemo;
+	private String batchYn;
+
 	private Integer recallexceptionno;
 	private Integer recallexceptionitemno;
 	private Integer recallexceptionmemono;
@@ -192,7 +195,8 @@ public class Delivery extends TscBaseDomain {
     private int saleQty;
     private int setqty;
     private int setitemqty;
-    
+	private int csAddFee;
+	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] custUseNoList;			
 

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

@@ -70,6 +70,8 @@
 			, USER_ID_MODIFIED
 			, USER_NAME_MODIFIED
 			, DATE_LAST_MODIFIED
+			, REG_NO
+			, REG_DT
 		)
 		VALUES
 		(
@@ -90,8 +92,11 @@
 			, #{useridmodified}
 			, #{usernamemodified}
 			, #{datelastmodified}
+			, #{regNo}
+			, NOW()
+			
 		)
-		ON DUPLICATE KEY UPDATE INVOICE_NO = #{invoiceno}
+		ON DUPLICATE KEY UPDATE INVOICE_NO = #{invoiceno}, LOGISTICS_NAME = #{logisticsname}, CHARGE_TYPE = #{chargetype}, CHARGE_AMOUNT = #{chargeamount}
 			
 	</insert>
 
@@ -111,6 +116,10 @@
 			, SKU_VALUE
 			, EXCEPTION_QTY
 			, REASON_CD
+			, QTY
+			, REASON_CODE
+			, REG_NO
+			, REG_DT
 		)
 		VALUES
 		(
@@ -125,8 +134,12 @@
 			, #{skuvalue}
 			, #{exceptionqty}
 			, #{reasoncd}
+			, #{qty}
+			, #{reasoncode}
+			, #{regNo}
+			, NOW()
 		)
-		ON DUPLICATE KEY UPDATE REASON_CD = #{reasoncd}
+		ON DUPLICATE KEY UPDATE REASON_CD = #{reasoncd}, REASON_CODE = #{reasoncode}, EXCEPTION_QTY = #{exceptionqty}
 	</insert>
 	
 	<!-- 회수예외 등록 메모   -->
@@ -141,6 +154,8 @@
 			, USER_ID_CREATED
 			, USER_NAME_CREATED
 			, DATE_CREATED
+			, REG_NO
+			, REG_DT
 		)
 		VALUES
 		(
@@ -151,6 +166,8 @@
 			, #{useridcreated}
 			, #{usernamecreated}
 			, #{datecreated}
+			, #{regNo}
+			, NOW()
 		)
 		ON DUPLICATE KEY UPDATE ADMIN_MEMO = #{adminmemo}
 	</insert>	
@@ -159,6 +176,8 @@
 	<select id="getWithdrawExcRsltList" resultType="Delivery">
 		/*TsbDelivery.getWithdrawExcRsltList*/
 		SELECT RECALL_EXCEPTION_NO AS RECALLEXCEPTIONNO
+			 , CS_ADD_FEE
+			 , CS_MEMO
 		  FROM TB_ORDER_RECALL_EXCEPTION
 		 WHERE RECALL_STAT = 'S'
 		   AND WMS_SEND_YN = 'N'
@@ -941,7 +960,7 @@
 			, C.PRODUCT_NO                        AS ProductNo
 			, C.PRODUCT_CODE                      AS ProductCode
 			, (SELECT CC.GOODS_NM FROM TB_GOODS CC WHERE CC.GOODS_CD = C.ITEM_CD) AS ProductName    -- 상품명 
-			, '일반'         														  AS ProductTypeCd  -- 상품타입
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN '세트' ELSE '일반' END 		  AS ProductTypeCd  -- 상품타입
 			, C.OPT_CD                            AS SKUCode       
 			, CONCAT(C.OPT_CD1,'/',C.OPT_CD2)     AS SKUValue
 			, B.CURR_PRICE + B.OPT_ADD_PRICE      AS UnitPrice
@@ -1026,6 +1045,7 @@
 	<!-- WMS 회수요청 대상 조회      -->	
 	<select id="getWithdrawRequestList" resultType="Delivery">
 		/*TsbDelivery.getWithdrawRequestList*/
+SELECT * FROM (
 		SELECT
 			  A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
 			, CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
@@ -1038,7 +1058,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, A.CHG_MEMO                                            AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1063,11 +1083,12 @@
 		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
 		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
 		 WHERE A.CHG_GB         = 'G680_30' -- 반품요청
-		   AND B.CHG_STAT       = 'G685_30' -- 회수요청 
+		   AND B.CHG_STAT       = 'G685_50' -- 반품접수
 		   AND B.DEL_YN         = 'N' 
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰
+		 --  and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1083,7 +1104,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, A.CHG_MEMO                                            AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1108,11 +1129,12 @@
 		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
 		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
 		 WHERE A.CHG_GB         = 'G680_40' -- 교환요청
-		   AND B.CHG_STAT       = 'G685_30' -- 회수요청
+		   AND B.CHG_STAT       = 'G685_20' -- 교환접수 
 		   AND B.DEL_YN         = 'N'
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰 
+		  -- and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1128,7 +1150,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, A.CHG_MEMO                                            AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1154,12 +1176,13 @@
 		  JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
 		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
 		 WHERE A.CHG_GB         = 'G680_30' -- 반품요청
-		   AND B.CHG_STAT       = 'G685_30' -- 회수요청 
+		   AND B.CHG_STAT       = 'G685_50' -- 반품접수 
 		   AND B.DEL_YN         = 'N'
 		   AND F.DWDP_YN        = 'N' -- N:자사몰에서 회수 
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 
+		 --  and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1175,7 +1198,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, A.CHG_MEMO                                            AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1201,12 +1224,14 @@
 		  JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
 		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
 		 WHERE A.CHG_GB         = 'G680_40' -- 교환요청
-		   AND B.CHG_STAT       = 'G685_30' -- 회수요청
+		   AND B.CHG_STAT       = 'G685_20' -- 교환요청
 		   AND B.DEL_YN         = 'N'
 		   AND F.DWDP_YN        = 'N' -- N:자사몰에서 회수 
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 		
+		 --  and A.REG_NO = '100025'
+		) A ORDER BY OrderExceptionNo
 	</select>	
 		
 	<!-- 주문변경상세 상태값 변경   -->
@@ -1313,6 +1338,7 @@
 		 WHERE A.WD_INVOICE_NO IS NOT NULL 
 		   AND A.CHG_GB IN('G680_30','G680_40')   -- 반품요청 교환요청
 		   AND A.SWT_TRC_SEND_YN = 'N'
+		   AND A.WD_GB           = 'W'
 		   AND B.CHG_STAT IN('G685_30','G685_31') --  회수요청 상품검수중
 		 GROUP BY A.WD_INVOICE_NO, A.SHIP_COMP_CD, A.ORD_CHG_SQ 
 	</select>
@@ -1517,6 +1543,7 @@
 		  WHERE A.COMPLTED_YN = 'N'
 		   AND B.GIFT_YN      = 'N'
 		   AND A.ORD_NO       = #{ordNo}
+		  GROUP BY A.ORD_NO, B.ORD_DTL_NO, C.CUST_NO, C.ORD_NM, D.PG_GB, D.PAY_MEANS, E.BANK_CD, E.ACCOUNT_NM, E.ACCOUNT_NO, B.EXCEPTION_QTY 
 	</select>	
 	
 	<!-- 품절대상 회수예외 주문 목록 조회         -->	
@@ -1525,7 +1552,7 @@
 		SELECT A.ORDER_NO 
 		  FROM TB_ORDER_RECALL_EXCEPTION A 
 		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO 
-		 WHERE B.REASON_CD IN ('확정 전 불량','확정 전 품절(재고없음)')
+		 WHERE B.REASON_CODE IN ('08','10')
 		   AND A.RECALL_STAT ='P'
 		 GROUP BY A.ORDER_NO 
 	</select>
@@ -1549,7 +1576,7 @@
 		  JOIN TB_ORDER                         C ON A.ORDER_NO = C.ORD_NO 
 		  JOIN TB_PAYMENT                       D ON A.ORDER_NO = D.ORD_NO   AND D.PAY_STAT = 'G016_30'
 		  LEFT OUTER JOIN TB_CUST_ACCOUNT       E ON C.CUST_NO = E.CUST_NO AND E.DEFAULT_YN = 'Y' AND E.DEL_YN = 'N'	  
-		 WHERE B.REASON_CD IN ('확정 전 불량','확정 전 품절(재고없음)')
+		 WHERE B.REASON_CD IN ('08','10')
 		   AND A.RECALL_STAT ='P'
 		   AND A.ORDER_NO = #{ordNo}
 	</select>

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

@@ -116,7 +116,7 @@
 		            AND    G.BRAND_CD = B.BRAND_CD
 		            AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		            AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		            AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		         --   AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		            AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		            AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		            AND    GC.USE_YN = 'Y' /*사용하는구성상품*/
@@ -247,7 +247,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -378,7 +378,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -448,7 +448,7 @@
 		    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		    AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		    AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		    AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		  --  AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		    AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		    AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		    AND    I.SIZE_GB IS NOT NULL
@@ -555,7 +555,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -712,7 +712,8 @@
 		            GROUP  BY SITE_CD, CATE_GB, FORMAL_GB, BRAND_GROUP_NO, CATE1_NO
 		           ) Z
 		)
-		SELECT SITE_CD
+		SELECT DISTINCT
+		       SITE_CD
 		     , CATE_GB
 		     , FORMAL_GB
 		     , BRAND_GROUP_NO
@@ -721,7 +722,7 @@
 		     , FILTER_CD
 		     , FILTER_NM
 		     , RANK() OVER(PARTITION BY SITE_CD, CATE_GB, FORMAL_GB, BRAND_GROUP_NO, CATE_NO
-		                   ORDER BY DISP_ORD
+		                   ORDER BY FILTER_CD
 		                   )  AS DISP_ORD
 		FROM   (
 		        SELECT SITE_CD
@@ -731,7 +732,6 @@
 		             , CATE_NO
 		             , PRICE1         AS FILTER_CD
 		             , PRICE1         AS FILTER_NM
-		             , 1              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -741,7 +741,6 @@
 		             , CATE_NO
 		             , PRICE2         AS FILTER_CD
 		             , PRICE2         AS FILTER_NM
-		             , 2              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -751,7 +750,6 @@
 		             , CATE_NO
 		             , PRICE3         AS FILTER_CD
 		             , PRICE3         AS FILTER_NM
-		             , 3              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -761,7 +759,6 @@
 		             , CATE_NO
 		             , PRICE4         AS FILTER_CD
 		             , PRICE4         AS FILTER_NM
-		             , 4              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -771,7 +768,6 @@
 		             , CATE_NO
 		             , PRICE5         AS FILTER_CD
 		             , PRICE5         AS FILTER_NM
-		             , 5              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -781,7 +777,6 @@
 		             , CATE_NO
 		             , PRICE6         AS FILTER_CD
 		             , PRICE6         AS FILTER_NM
-		             , 6              AS DISP_ORD
 		        FROM   TAB_PRICE
 		       ) Z
 	</insert>
@@ -1118,7 +1113,7 @@
 		    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		    AND    G.GOODS_TYPE != 'G056_N' /*일반상품이아닌넘*/
 		    AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		    AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		  --  AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		    AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
 		    AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		    AND    GS.SOLDOUT_YN = 'N' /*품절이아닌넘*/

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

@@ -570,8 +570,6 @@
 		                AND    CP.CPN_TYPE = 'G230_10' /*즉시할인쿠폰*/
 		                AND    CP.DC_CD_GB = 'G233_00'                         -- 일반유형(할인쿠폰구분)
 		                AND   (
-		                        (CP.APPLY_SCOPE = 'A' ) 
-		                        OR  /* 적용대상:상품*/
 		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
 		                                                   WHERE CPN_ID = CP.CPN_ID
 		                                                   AND CPN_TARGET = 'G260_10'
@@ -909,10 +907,17 @@
 		       FROM TB_REVIEW A
 		       WHERE DISP_YN = 'Y'
 		       AND DEL_YN = 'N'
+		       AND CONFIRM_YN = 'Y'  -- 승인된 상품평만 조회
 		       <if test='photoYn != null and photoYn == "Y"'>
-		       AND EXISTS (SELECT 1
+		       AND EXISTS (SELECT 1 
 		                   FROM TB_REVIEW_ATTACH B
-		                   WHERE B.REVIEW_SQ = A.REVIEW_SQ)
+		                   WHERE B.DEL_YN = 'N' 
+		                   AND B.REVIEW_SQ = A.REVIEW_SQ
+		                   AND (B.FILE_GB  = 'I'
+		                        OR
+		                        B.FILE_GB = 'M' AND B.KMC_KEY IS NOT NULL
+		                       )
+		                   )
 		       </if>
 		       <if test='photoYn != null and photoYn == "N"'>
 		       AND NOT EXISTS (SELECT 1
@@ -985,12 +990,7 @@
 		       FROM TB_REVIEW
 		       WHERE DISP_YN = 'Y'
 		       AND DEL_YN = 'N'
-		       <if test='photoYn != null and photoYn == "Y"'>
-		       AND SYS_FILE_NM IS NOT NULL
-		       </if>
-		       <if test='photoYn != null and photoYn == "N"'>
-		       AND SYS_FILE_NM IS NULL
-		       </if>
+		       AND CONFIRM_YN = 'Y'  -- 승인된 상품평만 조회
 		       GROUP BY GOODS_CD
 		    ) B
 		)
@@ -1021,6 +1021,7 @@
 		       FROM TB_REVIEW
 		       WHERE DISP_YN = 'Y'
 		       AND DEL_YN = 'N'
+		       AND CONFIRM_YN = 'Y'  -- 승인된 상품평만 조회
 		       <if test='photoYn != null and photoYn == "Y"'>
 		       AND SYS_FILE_NM IS NOT NULL
 		       </if>
@@ -1701,7 +1702,7 @@
 		AND    GC.COMPS_GOODS_CD = S.GOODS_CD
 		AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		-- AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		AND    GC.USE_YN = 'Y' /*사용하는구성상품*/

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

@@ -46,9 +46,9 @@
 		      ,CP.EXP_BE_DT 
 		FROM TB_CUST_POINT CP
 		WHERE  1=1
-		AND CP.EXP_BE_DT <![CDATA[<=]]> DATE_FORMAT(CONCAT(CURRENT_DATE(),' 23:59:59'), '%Y%m%d%H%i%S')
+		AND CP.EXP_BE_DT <![CDATA[<]]> DATE_FORMAT(CONCAT(CURRENT_DATE(),' 23:59:59'), '%Y%m%d%H%i%S')
 		AND CP.RM_PNT_AMT > 0
-		AND EXP_CMP_DT IS NOT NULL
+		AND EXP_CMP_DT IS NULL
 	</select>
 	
 	<insert id="saveExpirePointHst" parameterType="Point">

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

@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.batch.biz.dao.TsbWmsDeliveryDao">
-	
-	<!-- WMS 총알배송 권역정보 생성 1  
-	<select id="uspWmsDailyTmlInfoE10" statementType="CALLABLE" parameterType="Delivery" resultType="Delivery"  >
-		/* TsbDelivery.saveOrderDeliveryLocAssign   */
-		{ CALL USP_WMS_DailyTmlInfo_E10( '14', #{rtnCd, mode=OUT, jdbcType=INT, javaType=integer}, #{rtnMsg, mode=OUT, jdbcType=NVARCHAR, javaType=String}) }
-	</select>
-	-->
-	<!-- WMS 총알배송 권역정보 생성 2  
-	<select id="uspWmsDailyTmlInfoE20" statementType="CALLABLE" parameterType="Delivery" resultType="Delivery"  >
-		/* TsbDelivery.saveOrderDeliveryLocAssign   */
-		{ CALL USP_WMS_DailyTmlInfo_E10( '14', #{rtnCd, mode=OUT, jdbcType=INT, javaType=integer}, #{rtnMsg, mode=OUT, jdbcType=NVARCHAR, javaType=String}) }
-	</select>	
-	-->
-	
+
 	<!-- WMS_IF 총알배송 권역정보 조회   -->	
 	<select id="getWmsIfDailyDeliveryZoneList" resultType="Delivery">
 		/*TsbWmsDelivery.getWmsIfDailyDeliveryZoneList*/
@@ -56,13 +43,13 @@
 			, UserIdModified
 			, UserNameModified
 			, DateLastModified
-			, '0'   AS IfStat
-			, NULL AS IfDate
+			, IfStat
+			, IfDate
 		  FROM iSTYLE24_WmsIf.DBO.TB_IF_RecallException
 		WHERE 1=1
 		  AND IfStat = '0'
 		  AND StatusCd = '대기'
-		  AND DateCreated > CONVERT(datetime,'20200201'+' 00:00:00') -- 임시임 
+		  AND DateCreated > CONVERT(datetime,'20210510'+' 00:00:00') -- 임시임 
 	</select>
 	
 	<!-- WMS_IF 회수예외 목록 -D -->	
@@ -80,14 +67,16 @@
 			, A.ExceptionQty
 			, A.ReasonCd
 			, A.OrderDtlNo
-			, '0'   AS IfStat
-			, NULL AS IfDate
+			, A.IfStat
+			, A.IfDate
 			, B.OrderNo
+			, A.Qty
+			, A.ReasonCode
 		  FROM iSTYLE24_WmsIf.DBO.TB_IF_RecallExceptionItem A, iSTYLE24_WmsIf.DBO.TB_IF_RecallException B
 		 WHERE A.RecallExceptionNo = B.RecallExceptionNo
 		   AND A.IfStat = 0
 		   AND B.StatusCd = '대기'
-		   AND B.DateCreated > CONVERT(datetime,'20210201'+' 00:00:00') -- 임시임 
+		   AND B.DateCreated > CONVERT(datetime,'20210510'+' 00:00:00') -- 임시임 
 	</select>
 	
 	
@@ -102,13 +91,13 @@
 			, A.UserIdCreated
 			, A.UserNameCreated
 			, A.DateCreated
-			, '0' AS IfStat
-			, NULL AS IfDate
+			, A.IfStat
+			, A.IfDate
 		  FROM iSTYLE24_WmsIf.DBO.TB_IF_RecallExceptionMemo A, iSTYLE24_WmsIf.DBO.TB_IF_RecallException B
 		 WHERE A.RecallExceptionNo = B.RecallExceptionNo
 		   AND A.IfStat = 0
 		   AND B.StatusCd = '대기'
-		   AND B.DateCreated > CONVERT(datetime,'20210201'+' 00:00:00') -- 임시임 
+		   AND B.DateCreated > CONVERT(datetime,'20210510'+' 00:00:00') -- 임시임 
 	</select>
 	
 	
@@ -118,6 +107,10 @@
 		UPDATE iSTYLE24_WmsIf.DBO.TB_IF_RecallException SET 
 			   IfStat = #{ifstat}
 			 , IfDate = GETDATE()
+			 <if test='ifstat == "2"'>
+			 , CSenCloseFee = #{csAddFee}
+			 , CSMemo       = #{csMemo}
+			 </if>
 		WHERE RecallExceptionNo = #{recallexceptionno}
 		
 	</update>
@@ -281,7 +274,7 @@
 		 WHERE A.RecallNo  = B.RecallNo
 		   AND A.IsDeleted = 0
 		   AND B.StatusCd  = '입고완료'   
-		   AND B.IfStat    = '1' -- 회수완료 
+		   AND B.IfStat    = '2' -- 회수완료 
 	</select>
 	
 	<!-- 회수결과수신완료    -->
@@ -291,7 +284,7 @@
 			  IfStat = #{ifstat}
 			, IfDate = GETDATE()
 			WHERE RecallNo = #{recallno}
-			  AND IfStat = '1'
+			  AND IfStat = '2'
 	</update>	
 	
 	<!-- 회수상세결과수신완료    -->
@@ -302,7 +295,7 @@
 			, IfDate = GETDATE()
 		WHERE RecallNo     = #{recallno}
 		  AND RecallItemNo = #{recallitemno}
-		  AND IfStat       = '1'
+		  AND IfStat       = '2'
 	</update>	
 		
 	<!-- 출고 송장번호 조회  -->
@@ -325,6 +318,7 @@
 			, CASE WHEN orderDtlNo IS NULL THEN 'N' ELSE 'Y' END AS ORD_DTL_NO_YN
 		  FROM istyle24_Wmsif.dbo.TB_IF_DELIVERYINVOICE
 		 WHERE IfYn = 'N'
+		   AND SKUCode IS NOT NULL
 	</select>
 	
 	<!-- 출고 송장번호 수신완료    -->
@@ -499,12 +493,11 @@
 	
 	
 	<!-- 회수요청 M     -->
-	<insert id="insertWmsRecallDelivery" parameterType="Delivery" keyProperty="recallno" >
+	<insert id="insertWmsRecallDelivery" parameterType="Delivery" useGeneratedKeys="true" keyProperty="recallno" >
 		/*TsbWmsDelivery.insertWmsRecallDelivery*/
 		INSERT INTO iSTYLE24_WmsIf.dbo.TB_IF_RecallDelivery
 		(
-			  RecallNo				-- 반품 번호
-			, OrderExceptionNo		-- 주문 예외 번호
+			  OrderExceptionNo		-- 주문 예외 번호
 			, RecallTypeCd			-- 반품 타입
 			, Receiver				-- 받는자
 			, ReceiverTelNum		-- 받는자 전화번호
@@ -523,12 +516,12 @@
 			, DeliveryAddrNew		-- 도로명 주소
 			, RecallRequestYn		-- 회수요청여부
 			, IfStat				-- I/F상태
+			, IfDate
 			, encloseFee			-- 동봉비
 		)
 		VALUES 
 		(
-			  #{recallno}			-- 반품 번호
-			, #{orderexceptionno}	-- 주문 예외 번호
+			  #{orderexceptionno}	-- 주문 예외 번호
 			, #{recalltypecd}		-- 반품 타입
 			, #{receiver}			-- 받는자
 			, #{receivertelnum}		-- 받는자 전화번호
@@ -537,27 +530,27 @@
 			, #{deliveryaddr1}		-- 기본 주소
 			, #{deliveryaddr2}		-- 상세 주소
 			, #{orderno}			-- 주문 번호
-			, (SELECT AA.OrderGUID FROM iSTYLE24_WmsIf.dbo.TB_IF_DeliveryOrder AA WHERE AA.OrderNo = OrderNo) -- 주문 고유 번호
+			, (SELECT MAX(AA.OrderGUID) FROM iSTYLE24_WmsIf.dbo.TB_IF_DeliveryOrder AA WHERE AA.OrderNo = #{orderno}) -- 주문 고유 번호
 			, #{customername}		-- 주문자
 			, #{loginid}			-- 아이디S
 			, #{csmemo}				-- cs 메모
 			, #{datecsmemoupdated}	-- cs 메모 변경일
-			, #{datecreated}		-- 생성일
+			, GETDATE()				-- 생성일
 			, #{isdeleted}			-- 삭제 여부
 			, #{deliveryaddrnew}	-- 도로명 주소
 			, #{recallrequestyn}	-- 회수요청여부
 			, #{ifstat}				-- i/f상태
+			, GETDATE()				-- i/f 생성일
 			, 0						-- 동봉비
 		)
 	</insert>
 	
 	<!-- 회수요청 D     -->
-	<insert id="insertWmsRecallDeliveryItem" parameterType="Delivery" keyProperty="recallitemno" >
+	<insert id="insertWmsRecallDeliveryItem" parameterType="Delivery" useGeneratedKeys="true" keyProperty="recallitemno" >
 		/*TsbWmsDelivery."insertWmsRecallDeliveryItem"*/
 		INSERT INTO iSTYLE24_WmsIf.dbo.TB_IF_RecallDeliveryItem
 		(
-			  RecallItemNo		-- 반품 항목 번호
-			, RecallNo			-- 반품 번호
+			  RecallNo			-- 반품 번호
 			, ProductNo			-- 상품 번호
 			, ProductCode		-- 상품 코드
 			, ProductName		-- 상품명
@@ -572,11 +565,11 @@
 			, OrderDtlNo		-- 주문상세번호
 			, InvoiceNo			-- 원운송장번호
 			, IfStat			-- I/F상태
+			, IfDate
 		)
 		VALUES
 		(
-			  #{recallitemno}		-- 반품 항목 번호
-			, #{recallno}			-- 반품 번호
+			  #{recallno}			-- 반품 번호
 			, #{productno}			-- 상품 번호
 			, #{productcode}		-- 상품 코드
 			, #{productname}		-- 상품명
@@ -591,7 +584,7 @@
 			, #{orderdtlno}			-- 주문상세번호
 			, #{invoiceno}			-- 원운송장번호
 			, #{ifstat}				-- i/f상태
-			, #{ifdate}				-- i/f일자
+			, GETDATE()				-- i/f일자
 		)
 
 	</insert>
@@ -602,7 +595,7 @@
 		UPDATE istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERYITEM  SET
 			  LogisticsName     = 'CJ 대한통운'
 			, RecallInvoiceNo   = #{recallinvoiceno}
-			, LogisticsCode     = '29'
+			, LogisticsCode     = '05'
 			, IfDate            = GETDATE()
 		WHERE RecallNo = (SELECT MAX(RecallNo) FROM istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERY A WHERE A.OrderExceptionNo = #{ordChgSq} AND A.OrderNo = #{ordNo} )	
 	</update>