Bladeren bron

오류 수정

card007 5 jaren geleden
bovenliggende
commit
404e990fca

+ 10 - 0
src/main/java/com/style24/core/biz/dao/TscOrderChangeDao.java

@@ -556,4 +556,14 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 04. 22
 	 */
 	Collection<OrderChange> approveCancelRequestInfo(OrderChange orderChange);
+
+	/**
+	 * 주문취소 남은금액 조회
+	 *
+	 * @param int
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 22
+	 */
+	int getLeftAmt(int ordNo);
 }

+ 3 - 2
src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -441,10 +441,11 @@ public class TscOrderChangeService {
 				pg.setPgTid(pgTid);
 				pg.setPayMeans(payMeans);
 				pg.setPartCancelAmt(spanRefundAmt);
-				pg.setLeftAmt(payAmt);
+				pg.setLeftAmt(orderChangeDao.getLeftAmt(ordNo));
 				pg.setRegNo(userNo);
 				pg.setUpdNo(userNo);
-
+				log.info("cancelAmt >>> {}", pg.getPartCancelAmt());
+				log.info("leftAmt >>> {}", pg.getLeftAmt());
 				if (spanRefundAmt > 0) {
 					pgList.add(pg);
 				}

+ 2 - 5
src/main/java/com/style24/core/biz/service/TscOrderRefundService.java

@@ -301,19 +301,16 @@ public class TscOrderRefundService {
 					obj.setAddDelvFee(0);
 				}
 			}
-				
+
 			spanSumDeliveryFee		+= obj.getDelvFee();
 			spanRtnSumDeliveryFee	+= obj.getRtnDelvFee();
 			spanExcSumDeliveryFee	+= obj.getExcDelvFee();
 			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 프론트에서 필요한 부분 작업 필여
 		// 관리자 화면에서 사용하는 환불 칼럼 정보

+ 8 - 0
src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -2647,6 +2647,14 @@
 		   AND P.PAY_STAT = 'G016_30'
 		 WHERE OCD.ORD_CHG_SQ = #{ordChgSq}
 	</select>
+	
+	<!-- 주문취소 남은금액 조회 -->
+	<select id="getLeftAmt" parameterType="int" resultType="int">
+		/* TscOrderChange.getLeftAmt */
+		SELECT SUM(PAY_AMT) AS PAY_AMT
+		  FROM TB_PAYMENT
+		 WHERE ORD_NO = #{ordNo}
+	</select>
 </mapper>