Merge branch 'develop' into card007

# Conflicts:
#	src/main/java/com/style24/core/biz/dao/TscWmsDao.java
#	src/main/java/com/style24/core/biz/service/TscOrderService.java
#	src/main/java/com/style24/core/biz/service/TscWmsService.java
#	src/main/java/com/style24/persistence/mybatis/wms/TscWmsDelivery.xml

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

@@ -831,4 +831,25 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 06. 15
 	 */
 	int updateExchangeDelvFailCnclYn(Order order);
+	
+	/**
+	 * 교환 주문상세정보 수정
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author moon
+	 * @since 2021. 06. 14
+	 */	
+	int updateChgOrderDetailTemp(Order order);
+	
+
+	/**
+	 * 교환 주문상세단품정보 수정
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author moon
+	 * @since 2021. 06. 14
+	 */	
+	int updateChgOrderDetailItemTemp(Order order);	
 }

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);
 }

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

@@ -102,6 +102,16 @@ public interface TscWmsDao {
 	 * @since 2021. 04. 27
 	 */		
 	void updateWmsTbIfDelifixQty(WmsDelivery wmsDelivery);
+	
+	/**
+	 * WMS 회수지시 취소
+	 *
+	 * @param WmsDelivery 
+	 * @author moon
+	 * @since 2021. 06. 17
+	 */	
+	int updateWmsRecallCancel(WmsDelivery wmsDelivery);
+	
 
 	/**
 	 * WMS 회수지시 여부 조회

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

@@ -2849,6 +2849,19 @@ public class TscOrderService {
 	public Order getCustPaymeans(Order order) {
 		return orderDao.getCustPaymeans(order);
 	}
+	
+	/**
+	 * 스윗트래커 정보 조회
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 06. 17
+	 */
+	public Collection<Order> getSweetTrackerDeliveryInfo(Order order) {
+		return orderDao.getSweetTrackerDeliveryInfo(order);
+	}
+	
+	
 
 	/**
 	 * 배송비 테이블 결제시퀀스 등록

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

@@ -181,6 +181,19 @@ public class TscWmsService {
 			wmsDao.deleteWmsTbIfDelifixQty(sData);
 		}
 	}
+	
+	/**
+	 * WMS 회수지시 취소
+	 * @param 주문번호, 주문변경번호 
+	 * @author moon
+	 * @since 2021. 06. 17
+	 */
+	@Transactional("wmsTxnManager")
+	public void updateWmsRecallCancel(Integer ordNo, Integer ordChgSq) {
+		WmsDelivery sData = new WmsDelivery();
+		sData.setOrdNo(ordNo);
+		sData.setOrdChgSq(ordChgSq);
+		wmsDao.updateWmsRecallCancel(sData);
 
 	public Collection<WmsDelivery> getWmsWithdrawRequestInfo(WmsDelivery wmsDelivery) {
 		return wmsDao.getWmsWithdrawRequestInfo(wmsDelivery);

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;						// 출고메모
@@ -740,4 +741,12 @@ public class Order extends TscBaseDomain {
 	private String delvExpnYn;
 	private String addDeliveryFeeYn;
 	private int addDeliveryFee;	
+	private String wdBfSendYn;
+	
+	// 2021.06.17 스윗트래커 정보 조회
+	private String timeTrans;
+	private String delvWhere;
+	private String details;
+	private String telno;
+	
 }

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

@@ -18,6 +18,7 @@ public class WmsDelivery extends TscBaseDomain {
 	private Integer ordNo;
 	private Integer ordDtlNo;
 	private Integer ordDtlItemSq;
+	private Integer ordChgSq;
 	private String optCd;
 	
 	private String skuCode;

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

@@ -221,6 +221,8 @@
 		                 , A.RETURNABLE_YN
 		                 , A.CHANGEABLE_YN
 		                 , A.BRAND_GROUP_NM
+		                 , A.EXTMALL_NM
+		                 , A.SHIP_COMP_NM
 		              FROM (SELECT O.ORD_NO
 		                         , OD.ORD_DTL_NO
 		                         , ODI.ORD_DTL_ITEM_SQ
@@ -265,7 +267,7 @@
 		                         , OD.FORMAL_GB
 		                         , DATE_FORMAT(OD.DELV_ASSIGN_DT,'%Y%m%d%H%i%S') AS DELV_ASSIGN_DT
 		                         , OD.INVOICE_NO
-		                         , OD.DELV_STDT
+		                         , DATE_FORMAT(OD.DELV_STDT,'%Y%m%d%H%i%S') AS DELV_STDT
 		                         , OD.SOLDOUT_YN
 		                         , OD.SOLDOUT_MEMO
 		                         , DATE_FORMAT(OD.SOLDOUT_REG_DT,'%Y%m%d%H%i%S') AS SOLDOUT_REG_DT
@@ -290,6 +292,12 @@
 		                            WHERE  1=1
 		                            AND    BR.BRAND_CD = G1.BRAND_CD
 		                            AND    BG.USE_YN = 'Y') AS BRAND_GROUP_NM
+		                         , (SELECT EXTMALL_NM
+		                            FROM   TB_EXTMALL EX
+		                            WHERE  EX.EXTMALL_ID = OD.EXTMALL_ID) AS EXTMALL_NM
+		                         , (SELECT SHIP_COMP_NM
+		                            FROM   TB_SHIP_COMPANY SC
+		                            WHERE  SC.SHIP_COMP_CD = OD.SHIP_COMP_CD) AS SHIP_COMP_NM
 		                      FROM TB_ORDER O
 		                     INNER JOIN TB_ORDER_DETAIL OD
 		                        ON O.ORD_NO = OD.ORD_NO
@@ -484,6 +492,8 @@
 		                       , A.RETURNABLE_YN
 		                       , A.CHANGEABLE_YN
 		                       , A.BRAND_GROUP_NM
+		                       , A.EXTMALL_NM
+		                       , A.SHIP_COMP_NM
 		           ) Z
 		           JOIN (SELECT @rownum := 0) R
 		           ORDER BY Z.ORD_NO DESC
@@ -626,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'
@@ -704,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
@@ -804,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>
@@ -2929,7 +2954,10 @@
 		     , 'N'                          AS GIFT_ADDR_INP_YN
 		     , G.ORDER_MADE_YN              AS MAKE_GOODS_YN
 		     , #{entryNo}                   AS ENTRY_NO
-		     , NULL                         AS DELV_LOC_CD
+		     , CASE WHEN G.SELF_GOODS_YN IN ('Y')
+		            THEN NULL                         
+		            ELSE NULL 
+		            END                     DELV_LOC_CD
 		     , NULL                         AS DELV_ASSIGN_DT
 		     , 'P'                          AS DELV_ASSIGN_STAT
 		     , NULL                         AS DSTRBT_NOTE
@@ -4332,4 +4360,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>

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

@@ -3938,8 +3938,6 @@
 		     , Z.SELF_GOODS_YN
 		     , Z.GOODS_NM
 		     , Z.GOODS_TYPE
-		     , Z.PRICE_ORG
-		     , Z.PRICE_SALE
 		     , Z.ADD_PAY_COST
 		     , Z.SYS_IMG_NM
 		     , Z.GIFT_PACK_YN
@@ -3999,8 +3997,6 @@
 		           , ODI.ORD_DTL_ITEM_SQ
 		           , ODI.OPT_CD1
 		           , ODI.OPT_CD2
-		           , ROUND((ODH.ORD_AMT - ODH.CPN1_DC_AMT) * (OCD.CHG_QTY / ODH.ORD_QTY)) AS PRICE_ORG
-		           , ROUND((ODH.REAL_ORD_AMT + ODH.PNT_DC_AMT + ODH.GFCD_USE_AMT) * (OCD.CHG_QTY / OD.ORD_QTY)) AS PRICE_SALE
 		           , OC.ADD_PAY_COST
 		           , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
 		             ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
@@ -4043,9 +4039,6 @@
 		          ON OD.ORD_NO = ODI.ORD_NO
 		         AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		         AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		       INNER JOIN TB_ORDER_DETAIL_HST ODH
-		          ON OD.ORD_DTL_NO = ODH.ORD_DTL_NO
-		         AND ODH.ORD_DTL_STAT = 'G013_00'
 		       INNER JOIN TB_GOODS G1
 		          ON OD.GOODS_CD = G1.GOODS_CD
 		       INNER JOIN TB_GOODS G2
@@ -4082,7 +4075,7 @@
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.ORD_DATE, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_DT, Z.COMPLETE_DT, Z.CHG_STAT
 		        , Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE
-		        , Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.DELV_FEE_CD, Z.SUPPLY_COMP_NM, Z.ORD_NM, Z.CUST_NO, Z.ORD_EMAIL
+		        , Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.DELV_FEE_CD, Z.SUPPLY_COMP_NM, Z.ORD_NM, Z.CUST_NO, Z.ORD_EMAIL
 		        , Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT, Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT
 		        , Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT, Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_TID, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM
 		 ORDER BY Z.ORD_CHG_SQ DESC, Z.SELF_GOODS_YN DESC, Z.DELV_FEE_CD
@@ -4607,6 +4600,55 @@
 		AND    DELV_CNCL_YN = 'N'
 	</update>
 	
+	<!-- 교환 주문상세정보 수정 -->
+	<update id="updateChgOrderDetailTemp" parameterType="Order">
+		/* OrderChange.updateChgOrderDetailTemp */
+		UPDATE TB_ORDER_DETAIL OD
+		   SET OD.ORD_AMT          = #{cnclRtnAmt}
+		     <if test='wdBfSendYn == "N"'>
+		     , OD.ORD_DTL_STAT     = #{ordDtlStat}
+		     </if>
+		     , OD.ORD_QTY          = ABS(#{ordCanChgQty})
+			 , OD.CNCL_RTN_QTY     = 0
+			 , OD.CNCL_RTN_AMT     = 0
+			 , OD.CPN1_DC_AMT      = #{cpn1DcAmt}
+			 , OD.TMTB1_DC_AMT     = #{tmtb1DcAmt}
+			 , OD.TMTB2_DC_AMT     = #{tmtb2DcAmt}
+			 , OD.GOODS_CPN_DC_AMT = #{goodsCpnDcAmt}
+			 , OD.CART_CPN_DC_AMT  = #{cartCpnDcAmt}
+			 , OD.PNT_DC_AMT       = #{pntDcAmt}
+			 , OD.PRE_PNT_DC_AMT   = #{prePntDcAmt}
+			 , OD.SAVE_PNT_AMT     = #{savePntAmt}
+			 , OD.REAL_ORD_AMT     = #{realOrdAmt}
+			 , OD.GFCD_USE_AMT     = #{gfcdUseAmt}
+			 , OD.UPD_NO           = #{updNo}
+			 , OD.UPD_DT           = NOW()
+		 WHERE OD.ORD_NO = #{ordNo}
+		   AND OD.ORD_DTL_NO = #{ordDtlNo}
+	</update>
+	
+	<!-- 교환 주문상세단품정보 수정 -->
+	<update id="updateChgOrderDetailItemTemp" parameterType="Order">
+		/* OrderChange.updateChgOrderDetailItemTemp */
+		UPDATE TB_ORDER_DETAIL_ITEM
+		   SET ORD_AMT          = #{ordAmt}
+		     , CNCL_RTN_AMT     = 0
+		     , CPN1_DC_AMT      = #{cpn1DcAmt}
+		     , TMTB1_DC_AMT     = #{tmtb1DcAmt}
+		     , TMTB2_DC_AMT     = #{tmtb2DcAmt}
+		     , GOODS_CPN_DC_AMT = #{goodsCpnDcAmt}
+		     , CART_CPN_DC_AMT  = #{cartCpnDcAmt}
+		     , PRE_PNT_DC_AMT   = #{prePntDcAmt}
+		     , PNT_DC_AMT       = #{pntDcAmt}
+		     , REAL_ORD_AMT     = #{realOrdAmt}
+		     , GFCD_USE_AMT     = #{gfcdUseAmt}
+		     , SAVE_PNT_AMT     = #{savePntAmt}
+		     , UPD_NO           = #{updNo}
+		     , UPD_DT           = NOW()
+		 WHERE ORD_NO = #{ordNo}
+		   AND ORD_DTL_NO = #{ordDtlNo}
+		   AND ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
+	</update>		
 </mapper>
 
 

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

@@ -159,6 +159,19 @@
 		  AND SKUCode    = #{optCd} 
 		  AND ProductNo  = #{productNo}
 	</update>
+	
+	<!-- WMS 회수지시 삭제  -->
+	<update id="updateWmsRecallCancel" parameterType="WmsDelivery">
+		UPDATE iSTYLE24_WmsIf.dbo.TB_IF_RecallDelivery SET
+			  IsDeleted    = 1
+			, DateCreated  = GETDATE()
+		WHERE OrderExceptionNo  = #{ordChgSq}
+		  AND LoginId           = #{ordNo}
+		  AND IsDeleted         = 0
+	</update>
+	
+	
+	
 
 	<!-- WMS 회수지시 여부 조회 -->
 	<select id="getWmsWithdrawRequestInfo" parameterType="WmsDelivery" resultType="WmsDelivery">