반품TO교환 임시 커밋

src/main/java/com/style24/core/biz/dao/TscOrderChangeDao.java

@@ -309,7 +309,17 @@ public interface TscOrderChangeDao {
 	 * @author card007
 	 * @since 2021. 02. 01
 	 */
-	Order getAddDeliveryFeePayment(OrderChange orderChange);
+	Collection<Order> getAddDeliveryFeePayment(OrderChange orderChange);
+
+	/**
+	 * 추가배송비 취소 처리
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 06. 16
+	 */
+	int createAddDeliveryFeeCancel(OrderChange orderChange);
 
 	/**
 	 * 추가배송비 결제 취소 정보 생성 (사용안함)

src/main/java/com/style24/core/biz/dao/TscWmsDao.java

@@ -1,7 +1,6 @@
 package com.style24.core.biz.dao;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
@@ -103,4 +102,14 @@ public interface TscWmsDao {
 	 * @since 2021. 04. 27
 	 */		
 	void updateWmsTbIfDelifixQty(WmsDelivery wmsDelivery);
+
+	/**
+	 * WMS 회수지시 여부 조회
+	 * 
+	 * @param WmsDelivery
+	 * @return Collection<WmsDelivery>
+	 * @author card007
+	 * @since 2021. 06. 16
+	 */
+	Collection<WmsDelivery> getWmsWithdrawRequestInfo(WmsDelivery wmsDelivery);
 }

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -1713,7 +1713,7 @@ public class TscOrderChangeService {
 		
 		// 2. 주문변경이력정보 (TB_ORDER_CHANGE_DETAIL_HST(수정))
 		OrderChange orderChange = new OrderChange();
-		orderChange.setOrdChgSq((ordChgSq));
+		orderChange.setOrdChgSq(ordChgSq);
 		orderChange.setChgStat(TscConstants.OrderChangeStat.RETURN_CANCEL.value());
 		orderChange.setRegNo(userNo);
 		orderChange.setUpdNo(userNo);
@@ -1723,10 +1723,13 @@ public class TscOrderChangeService {
 		//orderChangeDao.createOrderDtlHstCancel(order);
 
 		// 4. PG 실행 (취소시 추가결제금액 취소처리)
-		Order payment = orderChangeDao.getAddDeliveryFeePayment(orderChange);
+		Collection<Order> paymentList = orderChangeDao.getAddDeliveryFeePayment(orderChange);
 		
 		// 추가배송비 존재 시
-		if (payment != null && payment.getPayAmt() > 0) {
+		if (paymentList != null && paymentList.size() > 0) {
+			// 추가배송비 취소 처리
+			orderChangeDao.createAddDeliveryFeeCancel(orderChange);
+
 			// 추가배송비 결제정보 조회
 			Payment pg = new Payment();
 			pg.setOrdChgSq(ordChgSq);
@@ -2034,11 +2037,14 @@ public class TscOrderChangeService {
 		int updNo = orderChange.getUpdNo();					// 수정자번호
 
 		// 1. 추가배송비 조회
-		Order payment = orderChangeDao.getAddDeliveryFeePayment(orderChange);
+		Collection<Order> paymentList = orderChangeDao.getAddDeliveryFeePayment(orderChange);
 
 		// 2. 추가배송비 존재 시 PG취소 정보 설정
 		Payment pg = new Payment();
-		if (payment != null && payment.getPayAmt() > 0) {
+		if (paymentList != null && paymentList.size() > 0) {
+			// 추가배송비 취소 처리
+			orderChangeDao.createAddDeliveryFeeCancel(orderChange);
+			
 			// 2-1. 추가배송비 결제정보 조회
 			pg.setOrdChgSq(ordChgSq);
 			pg = orderChangeDao.getAddPayCostPaymentInfo(pg);
@@ -4684,8 +4690,8 @@ public class TscOrderChangeService {
 
 		// 추가배송비 조회
 		int addpayCost = oneData.getAddPayCost();
-		Order addPayCostOrder = orderChangeDao.getAddDeliveryFeePayment(orderChange);
-		if (addPayCostOrder != null && addPayCostOrder.getPayAmt() > 0) {
+		Collection<Order> addPayCostOrder = orderChangeDao.getAddDeliveryFeePayment(orderChange);
+		if (addPayCostOrder != null && addPayCostOrder.size() > 0 && addPayCostOrder.iterator().next().getPayAmt() > 0) {
 			addpayCost = 0;
 		}
 

src/main/java/com/style24/core/biz/service/TscWmsService.java

@@ -181,4 +181,8 @@ public class TscWmsService {
 			wmsDao.deleteWmsTbIfDelifixQty(sData);
 		}
 	}
+
+	public Collection<WmsDelivery> getWmsWithdrawRequestInfo(WmsDelivery wmsDelivery) {
+		return wmsDao.getWmsWithdrawRequestInfo(wmsDelivery);
+	}
 }

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

@@ -31,6 +31,31 @@ public class WmsDelivery extends TscBaseDomain {
 	private int locQty;
 	private int chgQty;
 	private int itemQty;
-	
-	
+
+	// WMS 회수 지시
+	private int RecallNo;
+	private int OrderExceptionNo;
+	private String RecallTypeCd;
+	private String Receiver;
+	private String ReceiverTelNum;
+	private String ReceiverCellNum;
+	private String DeliveryPostalCode;
+	private String DeliveryAddr1;
+	private String DeliveryAddr2;
+	private int OrderNo;
+	private String CustomerName;
+	private String LoginId;
+	private String CSMemo;
+	private String DateCSMemoUpdated;
+	private String WMSMemo;
+	private String DateWMSMemoUpdated;
+	private String DateCreated;
+	private String IsDeleted;
+	private String DateDeleted;
+	private String DeliveryAddrNew;
+	private String RecallRequestYn;
+	private String IfStat;
+	private String IfDate;
+	private int encloseFee;
+	private int CodFee;
 }

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

@@ -36,7 +36,6 @@
 		                    THEN 0
 		                    ELSE OCD.ORD_REQ_CHG_QTY * ODI.ITEM_QTY
 		               END                                      AS ORD_REQ_CHG_QTY
-		             , OCD.CHG_GB
 		             , ODI.ITEM_PRICE
 		             , ODI.OPT_ADD_PRICE
 		             , ODI.ORD_AMT
@@ -70,6 +69,7 @@
 		                    THEN 'WMS'
 		                    ELSE OD.DELV_FEE_CD
 		                     END DELV_FEE_CD
+		             , X.CHG_GB
 		          FROM TB_ORDER O
 		         INNER JOIN TB_ORDER_DETAIL OD
 		            ON O.ORD_NO = OD.ORD_NO
@@ -82,7 +82,6 @@
 		            ON ODI.ITEM_CD = G2.GOODS_CD
 		          LEFT OUTER JOIN (
 		              SELECT OD.ORD_DTL_NO
-		                   , OC.CHG_GB
 		                   , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 		                FROM TB_ORDER_CHANGE_DETAIL OCD
 		               INNER JOIN TB_ORDER_DETAIL OD
@@ -93,7 +92,7 @@
 		                 AND OD.ORD_NO = #{ordNo}
 		                 AND OCD.DEL_YN = 'N'
 		                 AND OCD.CHG_STAT IN ('G685_20', 'G685_21','G685_30', 'G685_31', 'G685_32', 'G685_33', 'G685_34', 'G685_50', 'G685_51')
-		               GROUP BY OCD.ORD_DTL_NO, OC.CHG_GB
+		               GROUP BY OCD.ORD_DTL_NO
 		          ) OCD
 		            ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
 		          LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
@@ -128,7 +127,10 @@
 		              SELECT OCD.ORD_DTL_NO
 		                   , OCD.CHG_QTY
 		                   , ODI.OPT_CD2
+		                   , OC.CHG_GB
 		                FROM TB_ORDER_CHANGE_DETAIL OCD
+		               INNER JOIN TB_ORDER_CHANGE OC
+		                  ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
 		               INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		                  ON OCD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		               WHERE OCD.DEL_YN = 'N'
@@ -163,11 +165,11 @@
 		    AND Z.DELV_FEE_CD = #{delvFeeCdGrp}
 		) Y
 		 GROUP BY Y.ORD_NO, Y.ORD_DTL_NO, Y.ORD_DTL_STAT, Y.ORD_DTL_STAT_NM, Y.ALL_CAN_YN, Y.GOODS_CD, Y.GOODS_NM, Y.GOODS_TYPE, Y.GOODS_TYPE_NM
-		        , Y.ORD_DTL_ITEM_SQ, Y.ITEM_CD, Y.ITEM_NM, Y.OPT_CD, Y.OPT_CD1, Y.OPT_CD2, Y.ITEM_QTY, Y.ORD_QTY, Y.CNCL_RTN_QTY, Y.ORD_REQ_CHG_QTY, Y.CHG_GB
+		        , Y.ORD_DTL_ITEM_SQ, Y.ITEM_CD, Y.ITEM_NM, Y.OPT_CD, Y.OPT_CD1, Y.OPT_CD2, Y.ITEM_QTY, Y.ORD_QTY, Y.CNCL_RTN_QTY, Y.ORD_REQ_CHG_QTY
 		        , Y.ITEM_PRICE, Y.OPT_ADD_PRICE, Y.ORD_AMT, Y.CNCL_RTN_AMT, Y.CPN1_DC_AMT, Y.TMTB1_DC_AMT, Y.TMTB2_DC_AMT, Y.GOODS_CPN_DC_AMT
 		        , Y.CART_CPN_DC_AMT, Y.PNT_DC_AMT, Y.PRE_PNT_DC_AMT, Y.GFCD_USE_AMT, Y.REAL_ORD_AMT, Y.DELV_FEE, Y.SUPPLY_COMP_CD, Y.SUPPLY_COMP_NM
 		        , Y.DELV_FEE_CD, Y.MIN_ORD_AMT, Y.ORG_DELV_FEE, Y.RTN_DELV_FEE, Y.EXC_DELV_FEE, Y.ORD_CAN_CHG_QTY, Y.ORD_CHG_OPT, Y.OPT_CD2S, Y.CURR_STOCK_QTYS
-		        , Y.RTN_LOC_NM, Y.RTN_LOC_ZIPCODE, Y.RTN_LOC_BASE_ADDR, Y.RTN_LOC_DTL_ADDR, Y.RTN_LOC_TELNO, Y.SELF_GOODS_YN
+		        , Y.RTN_LOC_NM, Y.RTN_LOC_ZIPCODE, Y.RTN_LOC_BASE_ADDR, Y.RTN_LOC_DTL_ADDR, Y.RTN_LOC_TELNO, Y.SELF_GOODS_YN, Y.CHG_GB
 		 ORDER BY Y.DELV_FEE_CD, Y.ORD_NO, Y.ORD_DTL_NO
 	</select>
 
@@ -700,6 +702,7 @@
 		     , CHG_REASON
 		     , CHG_MEMO
 		     , WD_GB
+		     , WD_TARGET_YN
 		     , CHGER_NM
 		     , CHGER_PHNNO
 		     , CHGER_TELNO
@@ -720,6 +723,7 @@
 		     , #{chgReason}
 		     , #{chgMemo}
 		     , #{wdGb}
+		     , #{wdTargetYn}
 		     , #{chgerNm}
 		     , #{chgerPhnno}
 		     , #{chgerTelno}
@@ -2222,6 +2226,49 @@
 		   AND OC.ADD_PAY_COST > 0
 	</select>
 	
+	<!-- 추가배송비 취소 처리 -->
+	<insert id="createAddDeliveryFeeCancel" parameterType="OrderChange">
+		/* TscOrderChange.createAddDeliveryFeeCancel */
+		INSERT INTO TB_DELIVERY_FEE (
+		       PAY_SQ
+		     , ORD_NO
+		     , DELV_FEE_GB
+		     , DELV_FEE_CD
+		     , DELV_FEE
+		     , DELV_CPN_SQ
+		     , DELV_CPN_DC_AMT
+		     , REAL_DELV_AMT
+		     , ORD_CHG_SQ
+		     , SUPPLY_COMP_CD
+		     , DELV_USAC_YN
+		     , DELV_USAC_DT
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		)
+		SELECT NULL                   AS PAY_SQ
+		     , ORD_NO
+		     , DELV_FEE_GB
+		     , DELV_FEE_CD
+		     , DELV_FEE * -1          AS DELV_FEE
+		     , DELV_CPN_SQ
+		     , DELV_CPN_DC_AMT * -1   AS DELV_CPN_DC_AMT
+		     , REAL_DELV_AMT * -1     AS REAL_DELV_AMT
+		     , ORD_CHG_SQ
+		     , SUPPLY_COMP_CD
+		     , 'N'
+		     , NULL
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
+		  FROM TB_DELIVERY_FEE
+		 WHERE ORD_CHG_SQ = #{ordChgSq}
+		   AND PAY_STAT = 'G016_30'
+		   AND PAY_GB = 'D'
+	</insert>
+	
 	<!-- 추가배송비 결제 취소 정보 생성(사용안함) -->
 	<insert id="createAddDeliveryFeeCancelPayment" parameterType="Order" keyProperty="paySq">
 		/* OrderChange.createAddDeliveryFeeCancelPayment */

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

@@ -159,6 +159,37 @@
 		  AND SKUCode    = #{optCd} 
 		  AND ProductNo  = #{productNo}
 	</update>
-	
+
+	<!-- WMS 회수지시 여부 조회 -->
+	<select id="getWmsWithdrawRequestInfo" parameterType="WmsDelivery" resultType="WmsDelivery">
+		/* TscWmsDelivery.getWmsWithdrawRequestInfo */
+		SELECT RecallNo
+		     , OrderExceptionNo
+		     , RecallTypeCd
+		     , Receiver
+		     , ReceiverTelNum
+		     , ReceiverCellNum
+		     , DeliveryPostalCode
+		     , DeliveryAddr1
+		     , DeliveryAddr2
+		     , OrderNo
+		     , CustomerName
+		     , LoginId
+		     , CSMemo
+		     , DateCSMemoUpdated
+		     , WMSMemo
+		     , DateWMSMemoUpdated
+		     , DateCreated
+		     , IsDeleted
+		     , DateDeleted
+		     , DeliveryAddrNew
+		     , RecallRequestYn
+		     , IfStat
+		     , IfDate
+		     , encloseFee
+		     , CodFee
+		  FROM iSTYLE24_WmsIf.dbo.TB_IF_RECALLDELIVERY
+		 WHERE OrderExceptionNo = #{OrderExceptionNo}
+	</select>
 </mapper>