Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -821,4 +821,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/TscWmsDao.java

@@ -103,4 +103,14 @@ public interface TscWmsDao {
 	 * @since 2021. 04. 27
 	 */		
 	void updateWmsTbIfDelifixQty(WmsDelivery wmsDelivery);
+	
+	/**
+	 * WMS 회수지시 취소
+	 *
+	 * @param WmsDelivery 
+	 * @author moon
+	 * @since 2021. 06. 17
+	 */	
+	int updateWmsRecallCancel(WmsDelivery wmsDelivery);
+	
 }

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

@@ -1,20 +1,5 @@
 package com.style24.core.biz.service;
 
-import java.nio.charset.StandardCharsets;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gagaframework.excel.env.GagaExcelConstants;
 import com.gagaframework.excel.xssf.GagaExcelResultHandler;
@@ -30,10 +15,17 @@ import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Point;
 import com.usafe.guarantee.InsuranceManager;
-
 import lombok.extern.slf4j.Slf4j;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 주문관리 Service
@@ -2516,42 +2508,6 @@ public class TscOrderService {
 		return "SUCCESS";
 	}
 
-	public String encodeStr(String str) throws Exception {
-		byte[] SECRET_KEY = { 115, 51, 117, 70, 49, 65, 107, 125, 43, 118, 48, 65, 38, 57, 77, 67, 74, 120, 90, 87, 78, 80, 101, 102 };
-		SecretKeySpec KEYSPEC = new SecretKeySpec(SECRET_KEY, "DESede");
-
-		String result = null;
-		Cipher cipher = Cipher.getInstance("DESede/ECB/PKCS5Padding");
-		cipher.init(1, KEYSPEC);
-		byte[] plainText = str.getBytes(StandardCharsets.UTF_8);
-		byte[] cipherText = cipher.doFinal(plainText);
-		result = (new BASE64Encoder()).encode(cipherText);
-		return result;
-	}
-
-	public String decodeStr(String str) throws Exception {
-		byte[] SECRET_KEY = { 115, 51, 117, 70, 49, 65, 107, 125, 43, 118, 48, 65, 38, 57, 77, 67, 74, 120, 90, 87, 78, 80, 101, 102 };
-		SecretKeySpec KEYSPEC = new SecretKeySpec(SECRET_KEY, "DESede");
-
-		String result = null;
-		Cipher cipher = Cipher.getInstance("DESede/ECB/PKCS5Padding");
-		cipher.init(2, KEYSPEC);
-		byte[] base64bytes = (new BASE64Decoder()).decodeBuffer(str);
-		byte[] decryptedText = cipher.doFinal(base64bytes);
-		result = new String(decryptedText, StandardCharsets.UTF_8);
-		result = result.trim();
-		return result;
-	}
-
-	public String simpleEncode(String strVal) {
-		String result = strVal;
-		result = result.replaceAll("=", "%3D");
-		result = result.replaceAll("&", "%26");
-		result = result.replaceAll("%", "%25");
-		result = result.replaceAll(" ", "%20");
-		return result;
-	}
-
 	public String simpleDecode(String strVal) {
 		String result = strVal;
 		result = result.replaceAll("%3D", "=");

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

@@ -181,4 +181,18 @@ 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);
+	}
 }

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

@@ -740,4 +740,5 @@ public class Order extends TscBaseDomain {
 	private String delvExpnYn;
 	private String addDeliveryFeeYn;
 	private int addDeliveryFee;	
+	private String wdBfSendYn;
 }

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

@@ -1114,6 +1114,9 @@
 		/* TscOrder.updateNaverPayOrderNo */
 		UPDATE TB_ORDER SET
 		       NPAY_ORD_NO = #{npayOrdNo}
+		     , ORD_NM      = #{ordNm}
+		     , ORD_PHNNO   = #{ordPhnno}
+		     , ORD_EMAIL   = #{ordEmail}
 		     , UPD_NO      = #{updNo}
 		     , UPD_DT      = NOW()
 		WHERE  ORD_NO      = #{ordNo}

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

@@ -4544,6 +4544,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

@@ -160,5 +160,17 @@
 		  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>
+	
+	
+	
 </mapper>