112233

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

@@ -193,6 +193,9 @@ public class TscOrderChangeService {
 		// 3. 주문변경정보, 주문정보, 환불정보 (배송정책코드 별)
 		List<Payment> pgList = new ArrayList<>();
 		List<GiftCard> cashReceiptsList = new ArrayList<>();
+		
+		log.info("cancelDelvRefundList.size() ::: {}", cancelDelvRefundList.size());
+		
 		for (Order obj : cancelDelvRefundList) {
 			// 취소금액 있을 시 처리
 			if (obj.getCnclRtnAmt() > 0) {
@@ -318,8 +321,6 @@ public class TscOrderChangeService {
 							orderDetailItem.setRegNo(userNo);
 							orderDetailItem.setUpdNo(userNo);
 							orderDetailItem.setOrdDtlStat(ordDtlStat);
-
-							orderChangeDao.updateOrderDetailItem(orderDetailItem);
 							
 							// 2021.06.25 취소완료 (취소) (정산구분값추가)
 							// 품절취소
@@ -335,6 +336,8 @@ public class TscOrderChangeService {
 
 							orderChangeDao.createOrderDetailItemHst(orderDetailItem);
 
+							orderChangeDao.updateOrderDetailItem(orderDetailItem);
+
 							index++;
 						}
 
@@ -459,12 +462,19 @@ public class TscOrderChangeService {
 				}
 
 				// 3-4. PG 결제 취소 정보 설정 (상품권으로만 결제 시 PG점프)
+				
+				log.info("obj.getRealOrdAmt() ::: {}", obj.getRealOrdAmt());
+				log.info("obj.getDelvFee() ::: {}", obj.getDelvFee());
+				log.info("obj.getAddDelvFee() ::: {}", obj.getAddDelvFee());
+				
 				int spanRealCnclRtnAmt = obj.getRealOrdAmt();			// 취소금액합계
 				int sumDeliveryFee = obj.getDelvFee();					// 배송비합계
 				int spanDelvCpnDcAmt = obj.getDelvCpnDcAmt();			// 배송비쿠폰금액
 				int spanTotDeliveryFee = obj.getAddDelvFee();			// 추가배송비합계
 				int spanRefundAmt = spanRealCnclRtnAmt;
 				int addDelvFee = 0;
+				
+				log.info("obj.getLastCanYn() ::: {}", obj.getLastCanYn());
 
 				// 마지막 취소일때 배송비 추가
 				if ("Y".equals(obj.getLastCanYn())) {
@@ -512,6 +522,9 @@ public class TscOrderChangeService {
 				pg.setRegNo(userNo);
 				pg.setUpdNo(userNo);
 				
+				log.info("pg.getPartCancelAmt() ::: {}", pg.getPartCancelAmt());
+				log.info("pg.getLeftAmt() ::: {}", pg.getLeftAmt());
+				
 				if (spanRefundAmt > 0) {
 					pgList.add(pg);
 				}
@@ -2094,8 +2107,6 @@ public class TscOrderChangeService {
 							orderDetailItem.setRegNo(userNo);
 							orderDetailItem.setUpdNo(userNo);
 							orderDetailItem.setOrdDtlStat(ordDtlStat);
-
-							orderChangeDao.updateOrderDetailItem(orderDetailItem);
 							
 							// 2021.06.25 환불컨펌 (반품완료) (정산구분값추가)
 							orderDetailItem.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_RETURN_RETURN_COMPLETE.value());
@@ -2103,6 +2114,8 @@ public class TscOrderChangeService {
 							orderDetailItem.setOrdChgSq(ordChgSq);
 							orderChangeDao.createOrderDetailItemHst(orderDetailItem);
 
+							orderChangeDao.updateOrderDetailItem(orderDetailItem);
+
 							index++;
 						}
 

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

@@ -565,16 +565,16 @@
 		     , OD.ORD_QTY
 		     , #{cnclRtnAmt}
 		     , #{cnclRtnQty}
-		     , #{cpn1DcAmt}
-		     , #{tmtb1DcAmt}
-		     , #{tmtb2DcAmt}
-		     , #{goodsCpnDcAmt}
-		     , #{cartCpnDcAmt}
-		     , #{pntDcAmt}
-		     , #{prePntDcAmt}
-		     , #{savePntAmt}
-		     , #{realOrdAmt}
-		     , #{gfcdUseAmt}
+		     , ODI.CPN1_DC_AMT - #{cpn1DcAmt}
+		     , ODI.TMTB1_DC_AMT - #{tmtb1DcAmt}
+		     , ODI.TMTB2_DC_AMT - #{tmtb2DcAmt}
+		     , ODI.GOODS_CPN_DC_AMT - #{goodsCpnDcAmt}
+		     , ODI.CART_CPN_DC_AMT - #{cartCpnDcAmt}
+		     , ODI.PNT_DC_AMT - #{pntDcAmt}
+		     , ODI.PRE_PNT_DC_AMT - #{prePntDcAmt}
+		     , ODI.SAVE_PNT_AMT - #{savePntAmt}
+		     , ODI.REAL_ORD_AMT - #{realOrdAmt}
+		     , ODI.GFCD_USE_AMT - #{gfcdUseAmt}
 		     , #{ordChgSq}
 		     , #{regNo}
 		     , NOW()
@@ -3005,6 +3005,9 @@
 		     , Z.PAY_STAT
 		     , Z.CASH_AUTH_NO
 		     , Z.DELV_YN
+		 ORDER BY Z.DELV_FEE_CD
+		     , Z.ORD_NO
+		     , Z.ORD_DTL_NO
 	</select>
 	
 	<!-- 결제취소 환불정보 수정 -->