비회원 주문 임시 커밋

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

@@ -1130,8 +1130,8 @@ log.info("payAmt >>> {}", payAmt);
 				refundOrder.setRfPrePntAmt(obj.getPrePntDcAmt());
 				refundOrder.setRfGfcdUseAmt(obj.getGfcdAmt());
 				refundOrder.setRfCnclAmt(obj.getCnclRtnAmt());
-				refundOrder.setRfDeliveryFee(addDelvFee * -1);
-				refundOrder.setRfRealCnclAmt(spanRefundAmt + addDelvFee);
+				refundOrder.setRfDeliveryFee(spanTotRtnDelvFee * -1);
+				refundOrder.setRfRealCnclAmt(spanRefundAmt + spanTotRtnDelvFee);
 				refundOrder.setRaNo(accountNo);
 				refundOrder.setRaNm(accountNm);
 				refundOrder.setRaBank(bankCd);

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

@@ -308,10 +308,12 @@ public class TscOrderRefundService {
 			spanOrdAmt				+= obj.getOrdAmt();
 			spanCnclRtnAmt			+= obj.getCnclRtnAmt();
 			spanTotDeliveryFee  	+= obj.getAddDelvFee();
-			
+			log.info("AddDelvFee >>> {}", obj.getAddDelvFee());
+			log.info("RtnDelvFee >>> {}", obj.getRtnDelvFee());
 			cancelDelvRefundList.set(i, obj);
 		}
-		
+		log.info("spanTotDeliveryFee >>> {}", spanTotDeliveryFee);
+		log.info("spanRtnSumDeliveryFee >>> {}", spanRtnSumDeliveryFee);
 		// 5. FRONT 화면엣 필요한 금액 설정
 		// 2020.12.30 프론트에서 필요한 부분 작업 필여
 		// 관리자 화면에서 사용하는 환불 칼럼 정보

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

@@ -25,6 +25,7 @@ public class OrderChange extends TscBaseDomain {
 	private String orderNm;
 	private String ordNm;
 	private String ordPhnno;
+	private String delvFeeCd;
 	
 	private Integer ordChgSq;
 	private String chgGb;

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

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