개인통관분호 속도 이슈 개선 작업, 교환 TO 취소 결제 금액 오류 수정

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

@@ -1069,6 +1069,32 @@ public interface TscOrderDao {
 	 * @since 2021. 10. 25
 	 */
 	int createPaymentFail(Order order);
+	
+	/**
+	 * 회원 통관번호 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 11. 02
+	 */
+	int getCustEntryNo(Order order);
+	
+	/**
+	 * 회원 통관번호 등록
+	 * @param param
+	 * @author jsh77b
+	 * @since  2021. 11. 02
+	 */
+	void createCustEntryNo(Order order);
+	
+	/**
+	 * 회원 통관번호 수정
+	 * @param param
+	 * @author jsh77b
+	 * @since  2021. 11. 02
+	 */
+	void updateCustEntryNo(Order order);
 }
 
 

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

@@ -5874,7 +5874,7 @@ public class TscOrderChangeService {
 
 						int leftAmt = orderChange.getAddPayCost() / 2;
 
-						pg.setLeftAmt(leftAmt);
+						pg.setLeftAmt(orderChange.getAddPayCost());
 						pg.setPartCancelAmt(leftAmt);
 					}
 				}

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

@@ -1517,6 +1517,8 @@ public class TscOrderService {
 		// 4. 주문상세정보등록
 		Collection<Order> orderDetailList = order.getOrderDetailList();
 		
+		String entryNo = "";
+		
 		for (Order orderDetail : orderDetailList) {
 			orderDetail.setOrdNo(order.getOrdNo());
 			orderDetail.setOrdExchGb("O");
@@ -1547,6 +1549,11 @@ public class TscOrderService {
 				orderDetail.setShotDelvYn("N");
 			}
 			
+			// 2021.11.02 통관번호등록
+			if (orderDetail.getEntryNo() != null && !"".equals(orderDetail.getEntryNo())) {
+				entryNo = orderDetail.getEntryNo();
+			}
+			
 			// TODO 총알배송, 구매대행상품여부 체크
 			orderDao.createOrderDetail(orderDetail); // 주문상세정보등록
 			
@@ -1632,6 +1639,20 @@ public class TscOrderService {
 			}
 		}
 		
+		// 2021.11.02 회원통관번호 테이블에 통관번호 등록 
+		if (order.getCustNo() > 0) {
+			if (!"".equals(entryNo)) {
+				order.setEntryNo(entryNo);
+				int cnt = orderDao.getCustEntryNo(order);
+				
+				if (cnt < 1) {
+					orderDao.createCustEntryNo(order);
+				} else {
+					orderDao.updateCustEntryNo(order);
+				}
+			}
+		}
+		
 		// 5. 주문사은품정보등록
 		order.setOrdDtlStat(TscConstants.OrderDetailStat.ORDER_RECEIPT.value());
 		if(order.getFreegiftValArr() != null && order.getFreegiftValArr().length > 0) {

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

@@ -5460,13 +5460,12 @@
 	<!-- 개인통관부호 정보 가져오기 -->
 	<select id="getEntryNo" parameterType="Order" resultType="Order">
 		/* order.getEntryNoInfo */
-		SELECT OD.ENTRY_NO
-		FROM   TB_ORDER_DETAIL OD
+		SELECT ENTRY_NO
+		FROM   TB_CUST_ENTRY_NO
 		WHERE  1=1
-		AND    OD.REG_NO = #{custNo}
-		AND    OD.ENTRY_NO IS NOT NULL
-		AND    LENGTH(OD.ENTRY_NO) = 13
-		ORDER  BY OD.ORD_NO DESC
+		AND    CUST_NO = #{custNo}
+		AND    DEL_YN = 'N'
+		AND    ENTRY_NO IS NOT NULL
 		LIMIT  1
 	</select>
 
@@ -5763,6 +5762,52 @@
 		 WHERE DELV_BAN_ZIPCODE = #{recipZipcode}
 		   AND DEL_YN = 'N'
 	</select>
+	
+	<!-- 개인통관부호 정보 가져오기 -->
+	<select id="getCustEntryNo" parameterType="Order" resultType="int">
+		/* order.getCustEntryNo */
+		SELECT COUNT(1)
+		FROM   TB_CUST_ENTRY_NO
+		WHERE  1=1
+		AND    CUST_NO = #{custNo}
+		AND    ENTRY_NO = #{entryNo}
+		AND    DEL_YN = 'N'
+	</select>
+	
+	<!-- 회원 통관번호 등록 -->
+	<insert id="createCustEntryNo" parameterType="Order">
+		/* TscOrder.createCustEntryNo : 회원 통관번호 등록 */
+		INSERT INTO TB_CUST_ENTRY_NO (
+			CUST_NO
+			, ENTRY_NO
+			, DEL_YN
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			#{custNo}
+			, #{entryNo}
+			, 'N'
+			, #{custNo}
+			, NOW()
+			, #{custNo}
+			, NOW()
+		)
+	</insert>
+	
+	<!-- 회원 통관번호 수정 -->
+	<update id="updateCustEntryNo" parameterType="Order">
+		/* TscOrder.updateCustEntryNo : 회원 통관번호 수정 */
+		UPDATE TB_CUST_ENTRY_NO
+		SET    ENTRY_NO = #{entryNo}
+		     , UPD_NO = #{custNo}
+		     , UPD_DT = NOW()
+		WHERE  1=1
+		AND    CUST_NO = #{custNo}
+		AND    DEL_YN = 'N'
+	</update>
+	
 </mapper>
 
 

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

@@ -4489,10 +4489,10 @@
 		     , DF.ORD_NO
 		     , DF.DELV_FEE_GB
 		     , DF.DELV_FEE_CD
-		     , (DF.DELV_FEE / 2) * -1          AS DELV_FEE
+		     , DF.DELV_FEE * -1                AS DELV_FEE
 		     , NULL                            AS DELV_CPN_SQ
 		     , 0                               AS DELV_CPN_DC_AMT
-		     , (DF.REAL_DELV_AMT / 2) * -1     AS REAL_DELV_AMT
+		     , DF.REAL_DELV_AMT * -1           AS REAL_DELV_AMT
 		     , DF.ORD_CHG_SQ
 		     , DF.SUPPLY_COMP_CD
 		     , 'N'
@@ -4505,6 +4505,7 @@
 		 INNER JOIN TB_PAYMENT P
 		    ON P.ORD_CHG_SQ = DF.ORD_CHG_SQ
 		   AND P.PAY_STAT = 'G016_30'
+		   AND DF.DLEV_FEE_GB = 'G018_30'
 		   AND P.PAY_GB = 'D'
 		 WHERE DF.ORD_CHG_SQ = #{ordChgSq}
 	</insert>