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

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

@@ -550,16 +550,6 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 03. 25
 	 */
 	Collection<Order> getRefundPreInfo(OrderChange orderChange);
-	
-	/**
-	 * 취소/반품 환불 사전 정보 조회 2
-	 *
-	 * @param Order
-	 * @return Collection<Order>
-	 * @author card007
-	 * @since 2021. 03. 25
-	 */
-	Collection<Order> getRefundPreInfo2(OrderChange orderChange);
 
 	/**
 	 * 교환 상품 재고 조회

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

@@ -928,4 +928,14 @@ public interface TscOrderDao {
 	 * @since 2021. 06. 17
 	 */
 	Collection<Order> getSweetTrackerDeliveryInfo(Order order);
+
+	/**
+	 * 추가배송비 결제금액 환불배송비 수정 처리
+	 * 
+	 * @param Payment
+	 * @return int
+	 * @author card007
+	 * @since 2021. 06. 18
+	 */
+	int updateRefundDeliveryFee(Payment payment);
 }

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

@@ -1703,7 +1703,7 @@ public class TscOrderChangeService {
 		List<Integer> ordDtlNoList 	= Arrays.stream(ordDtlNoArr).boxed().collect(Collectors.toList());
 
 		// 환불 사전 정보 조회 (주문상세단위)
-		Collection<Order> cnclRtnList = orderChangeDao.getRefundPreInfo2(orderChange);
+		Collection<Order> cnclRtnList = orderChangeDao.getRefundPreInfo(orderChange);
 		Order cnclRtn = cnclRtnList.iterator().next();
 
 		// 전체 및 마지막 취소여부 설정
@@ -2839,6 +2839,18 @@ public class TscOrderChangeService {
 		return map;
 	}
 
+	/**
+	 * 주문변경정보 조회
+	 *
+	 * @param OrderChange
+	 * @return Collection<OrderChange>
+	 * @author card007
+	 * @since 2021. 05. 24
+	 */
+	public Collection<OrderChange> getOrderChangeDetailInfo(OrderChange orderChange) {
+		return orderChangeDao.getOrderChangeDetailInfo(orderChange);
+	}
+
 	/**
 	 * 주문 취소 자동메일 정보 조회
 	 * 

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

@@ -2876,8 +2876,19 @@ public class TscOrderService {
 	public void updateDeliveryFeePaySq(Payment payment) {
 		orderDao.updateDeliveryFeePaySq(payment);
 	}
-	
-	
+
+	/**
+	 * 추가배송비 결제금액 환불배송비 수정 처리
+	 *
+	 * @param Payment
+	 * @return int
+	 * @author card007
+	 * @since 2021. 06. 18
+	 */
+	@Transactional("shopTxnManager")
+	public int updateRefundDeliveryFee(Payment payment) {
+		return orderDao.updateRefundDeliveryFee(payment);
+	}
 }
 
 

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

@@ -2750,10 +2750,12 @@
 		    , UPD_NO = #{updNo}
 		    , UPD_DT = NOW()
 		WHERE ORD_NO = #{ordNo}
+		AND   PAY_STAT = 'G016_00'
 		<if test="ordChgSq != null and ordChgSq > 0">
 		AND   ORD_CHG_SQ = #{ordChgSq}
+		ORDER BY REG_DT DESC
+		LIMIT 1
 		</if>
-		AND   PAY_STAT = 'G016_00'
 	</update>
 
 	<!-- 결제 상태 수정 -->
@@ -4447,4 +4449,12 @@
 		   AND INVOICE_NO = #{invoiceNo}
 		 ORDER BY DELV_LEVEL DESC
 	</select>
+	
+	<!-- 추가배송비 결제금액 환불배송비 수정 처리 -->
+	<update id="updateRefundDeliveryFee" parameterType="payment">
+		/* TscOrder.updateRefundDeliveryFee */
+		UPDATE TB_REFUND
+		   SET RF_DELIVERY_FEE = RF_DELIVERY_FEE - #{payAmt}
+		 WHERE ORD_CHG_SQ = #{ordChgSq}
+	</update>
 </mapper>

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

@@ -723,7 +723,7 @@
 		     , #{chgReason}
 		     , #{chgMemo}
 		     , #{wdGb}
-		     , #{wdTargetYn}
+		     , IFNULL(#{wdTargetYn}, 'Y')
 		     , #{chgerNm}
 		     , #{chgerPhnno}
 		     , #{chgerTelno}
@@ -3031,7 +3031,8 @@
 		                  , SUM(DELV_CPN_DC_AMT) AS DELV_CPN_DC_AMT
 		                  , SUM(REAL_DELV_AMT) AS REAL_DELV_AMT
 		               FROM TB_DELIVERY_FEE
-		              WHERE DELV_FEE_GB = 'G018_10'
+		              WHERE ORD_NO = #{ordNo}
+		                AND DELV_FEE_GB = 'G018_10'
 		              GROUP BY ORD_NO) DF
 		    ON OD.ORD_NO = DF.ORD_NO
 		 WHERE OD.ORD_NO = #{ordNo}
@@ -3097,112 +3098,6 @@
 	<!-- 취소/반품 환불 사전 정보 조회 -->
 	<select id="getRefundPreInfo" parameterType="OrderChange" resultType="Order">
 		/* TscOrderChange.getRefundPreInfo */
-		SELECT O.ORD_NO
-		     , OD.ORD_DTL_NO
-		     , OD.GOODS_CD
-		     , G1.GOODS_NM
-		     , ODI.ORD_DTL_ITEM_SQ
-		     , ODI.ITEM_CD
-		     , G2.GOODS_NM                                        AS ITEM_NM
-		     , ODI.ITEM_QTY
-		     , OD.ORD_QTY
-		     , OD.CNCL_RTN_QTY
-		     , OCD.ORD_REQ_CHG_QTY
-		     , ODI.ITEM_PRICE
-		     , ODI.OPT_ADD_PRICE
-		     , ODI.ORD_AMT
-		     , ODI.OPT_CD1
-		     , ODI.OPT_CD2
-		     , ODI.CPN1_DC_AMT
-		     , ODI.TMTB1_DC_AMT
-		     , ODI.TMTB2_DC_AMT
-		     , ODI.GOODS_CPN_DC_AMT
-		     , ODI.CART_CPN_DC_AMT
-		     , ODI.PNT_DC_AMT
-		     , ODI.PRE_PNT_DC_AMT
-		     , ODI.SAVE_PNT_AMT
-		     , ODI.GFCD_USE_AMT
-		     , ODI.CNCL_RTN_AMT
-		     , ODI.REAL_ORD_AMT
-		     , FN_GET_CODE_NM('G056', OD.GOODS_TYPE)              AS GOODS_TYPE_NM
-		     , ODI.ORD_DTL_STAT
-		     , FN_GET_CODE_NM('G013', ODI.ORD_DTL_STAT)           AS ORD_DTL_STAT_NM
-		     , DF.DELV_FEE
-		     , DF.DELV_CPN_DC_AMT
-		     , DFP.MIN_ORD_AMT
-		     , DFP.DELV_FEE                                       AS ORG_DELV_FEE
-		     , DFP.RTN_DELV_FEE
-		     , DFP.DELV_FEE + DFP.RTN_DELV_FEE                    AS EXC_DELV_FEE
-		     , DFP.SUPPLY_COMP_CD
-		     , IF(G1.SELF_GOODS_YN = 'Y', 'WMS', DFP.DELV_FEE_CD) AS DELV_FEE_CD
-		     , P.PG_GB
-		     , P.PG_TID
-		     , P.PAY_MEANS
-		     , P.PAY_STAT
-		     , P.CASH_AUTH_NO
-		     , CASE WHEN NULLIF(OD.INVOICE_NO, '') IS NULL THEN 'N'
-		            ELSE 'Y'
-		        END AS DELV_YN
-		  FROM TB_ORDER O
-		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON O.ORD_NO = OD.ORD_NO
-		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		    ON O.ORD_NO = ODI.ORD_NO
-		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		 INNER JOIN TB_GOODS G1
-		    ON OD.GOODS_CD = G1.GOODS_CD
-		 INNER JOIN TB_GOODS G2
-		    ON ODI.ITEM_CD = G2.GOODS_CD
-		 INNER JOIN TB_PAYMENT P
-		    ON P.ORD_NO = O.ORD_NO
-		   AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		   AND P.PAY_GB = 'O'
-		  LEFT OUTER JOIN (SELECT OCD.ORD_DTL_NO
-		                        , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
-		                     FROM TB_ORDER_CHANGE_DETAIL OCD
-		               INNER JOIN TB_ORDER_DETAIL OD
-		                       ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		                    WHERE 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
-		                  ) OCD
-		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
-		  LEFT OUTER JOIN (SELECT X.DELV_FEE_CD
-		                        , SUM(X.DELV_FEE)        AS DELV_FEE
-		                        , SUM(X.DELV_CPN_DC_AMT) AS DELV_CPN_DC_AMT
-		                     FROM TB_DELIVERY_FEE X
-		                    WHERE X.DELV_FEE_GB = 'G018_10'
-		                      AND X.ORD_NO = #{ordNo}
-		                    GROUP BY X.DELV_FEE_CD
-		                  ) DF
-		    ON IF(G1.SELF_GOODS_YN = 'Y', 'WMS', OD.DELV_FEE_CD) = DF.DELV_FEE_CD
-		  LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
-		    ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
-		   AND DFP.USE_YN = 'Y'
-		<where>
-			<choose>
-				<when test='custNo > 0'>
-		   AND O.CUST_NO = #{custNo}
-				</when>
-				<otherwise>
-		   AND O.ORD_NO = #{ordNo}
-		   AND O.ORD_NM = #{ordNm}
-		   AND O.ORD_PHNNO = #{ordPhnno}
-				</otherwise>
-			</choose>
-			<if test="ordNo != null and ordNo != ''">
-		   AND O.ORD_NO = #{ordNo}
-			</if>
-			<if test="delvFeeCd != null and delvFeeCd != ''">
-		   AND OD.DELV_FEE_CD = #{delvFeeCd}
-			</if>
-		   AND O.DISP_YN = 'Y'
-		</where>
-	</select>
-
-	<!-- 취소/반품 환불 사전 정보 조회 -->
-	<select id="getRefundPreInfo2" parameterType="OrderChange" resultType="Order">
-		/* TscOrderChange.getRefundPreInfo2 */
 		SELECT Z.ORD_NO
 		     , Z.ORD_DTL_NO
 		     , Z.GOODS_NM
@@ -3666,6 +3561,8 @@
 		     , R.RA_NO                                    AS ACCOUNT_NO
 		     , R.RA_BANK                                  AS BANK_CD
 		     , R.RA_NM                                    AS ACCOUNT_NM
+		     , OC.WD_INVOICE_NO
+		     , OC.WD_INVOICE_SEND_YN
 		  FROM TB_ORDER_CHANGE OC
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ