Merge branch 'card007' into order

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);
 }

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

@@ -184,7 +184,7 @@ public class TscKcpService {
 				payment.setQuotaopt(12);					// 최대 할부 개월 수
 			} else if(order.getPayMeans() != null && TscConstants.PayMeans.BANK_DEPOSIT.value().equals(order.getPayMeans())) {		// KCP 가상계좌(무통장입금)
 				payment.setPayMethod("001000000000");		// 가상계좌
-				payment.setVcntExpireTerm(3);				// 무통장입금 유효기간
+				payment.setVcntExpireTerm(2);				// 무통장입금 유효기간
 			} else if(order.getPayMeans() != null && TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(order.getPayMeans())) {	// KCP 계좌이체(실시간계좌이체)
 				payment.setPayMethod("010000000000");		// 계좌이체
 			} else if(order.getPayMeans() != null && TscConstants.PayMeans.CELL_PHONE.value().equals(order.getPayMeans())) {		// KCP 휴대폰결제

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

@@ -289,19 +289,21 @@ public class TscOrderChangeService {
 
 						// 3-2-3. 사용포인트원복
 						int pntDcAmt = vo.getPntDcAmt();
-						vo.setOccurGb(TscConstants.PointOccurGb.USE_POINT.value());
+						vo.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT.value());
 
 						for (Order point : orderChangeDao.getCustPointHst(vo)) {
-							while (pntDcAmt > 0) {
-								if (pntDcAmt < (point.getPntAmt() * -1)) {
-									point.setPntAmt(pntDcAmt * -1);
+							if (pntDcAmt > 0) {
+								int pntAmt = point.getPntAmt() * -1;
+
+								if (pntDcAmt < pntAmt) {
+									point.setPntAmt(pntDcAmt);
 									pntDcAmt -= pntDcAmt;
 								} else {
-									point.setPntAmt(point.getPntAmt() * -1);
-									pntDcAmt -= (point.getPntAmt() * -1);
+									point.setPntAmt(pntAmt);
+									pntDcAmt -= pntAmt;
 								}
 
-								point.setOccurGb(TscConstants.PointOccurGb.USE_POINT_CANCEL.value());
+								point.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT_CANCEL.value());
 								point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 								point.setOccurDtlDesc("포인트사용취소");
 								point.setRegNo(userNo);
@@ -339,12 +341,15 @@ public class TscOrderChangeService {
 						int gfcdUseAmt = vo.getGfcdUseAmt();
 
 						for (Order giftCard : orderChangeDao.getCustGiftCardHst(vo)) {
-							while (gfcdUseAmt > 0) {
-								if (gfcdUseAmt < (giftCard.getGfcdAmt() * -1)) {
+							if (gfcdUseAmt > 0) {
+								int gfcdAmt = giftCard.getGfcdAmt() * -1;
+
+								if (gfcdUseAmt < gfcdAmt) {
 									giftCard.setGfcdAmt(gfcdUseAmt);
 									gfcdUseAmt -= gfcdUseAmt;
 								} else {
-									gfcdUseAmt -= (giftCard.getGfcdAmt() * -1);
+									giftCard.setGfcdAmt(gfcdAmt);
+									gfcdUseAmt -= gfcdAmt;
 								}
 
 								giftCard.setOccurGb(TscConstants.GiftCardOccurGb.USE_GIFTCARD_CANCEL.value());
@@ -404,8 +409,7 @@ public class TscOrderChangeService {
 				if ("Y".equals(obj.getLastCanYn())) {
 					spanRefundAmt += sumDeliveryFee;					// 환불금액 계산
 					addDelvFee = sumDeliveryFee;						// 추가배송비 계산
-					
-					// TODO
+
 					// TB_DELIVERY_FEE 배송비 취소 처리
 					Order cancelDelvFee = new Order();
 					// cancelDelvFee.setPaySq(pg.getPaySq());
@@ -437,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);
 				}
@@ -704,10 +709,10 @@ public class TscOrderChangeService {
 
 						// 5.3.3 사용포인트원복
 						int pntDcAmt = vo.getPntDcAmt();
-						vo.setOccurGb(TscConstants.PointOccurGb.USE_POINT.value());
+						vo.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT.value());
 
 						for (Order point : orderChangeDao.getCustPointHst(vo)) {
-							while (pntDcAmt > 0) {
+							if (pntDcAmt > 0) {
 								if (pntDcAmt < point.getPntAmt()) {
 									point.setPntAmt(pntDcAmt);
 									pntDcAmt -= pntDcAmt;
@@ -715,7 +720,7 @@ public class TscOrderChangeService {
 									pntDcAmt -= point.getPntAmt();
 								}
 
-								point.setOccurGb(TscConstants.PointOccurGb.USE_POINT_CANCEL.value());
+								point.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT_CANCEL.value());
 								point.setOccurDtlDesc("포인트사용취소");
 								point.setRegNo(userNo);
 								point.setUpdNo(userNo);
@@ -750,7 +755,7 @@ public class TscOrderChangeService {
 						int gfcdUseAmt = vo.getGfcdUseAmt();
 
 						for (Order giftCard : orderChangeDao.getCustGiftCardHst(vo)) {
-							while (gfcdUseAmt > 0) {
+							if (gfcdUseAmt > 0) {
 								if (gfcdUseAmt < giftCard.getGfcdAmt()) {
 									giftCard.setGfcdAmt(gfcdUseAmt);
 									gfcdUseAmt -= gfcdUseAmt;
@@ -2222,11 +2227,11 @@ public class TscOrderChangeService {
 		// 2. 사용포인트원복
 		Order vo = new Order();
 		vo.setOrdNo(ordNo);
-		vo.setOccurGb(TscConstants.PointOccurGb.USE_POINT.value());
+		vo.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT.value());
 		vo.setUpdNo(updNo);
 
 		for (Order point : orderChangeDao.getCustPointHst(vo)) {
-			point.setOccurGb(TscConstants.PointOccurGb.USE_POINT_CANCEL.value());
+			point.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT_CANCEL.value());
 			point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 			point.setOccurDtlDesc("포인트사용취소");
 			point.setPntAmt(point.getPntAmt() * -1);
@@ -2517,6 +2522,7 @@ public class TscOrderChangeService {
 				order.setOrdCanChgQty(cnclRtnReqQtyArr[index]);
 			} else {
 				order.setOrdCanChgQty(0);
+				order.setRtnDelvFee(0);
 			}
 
 			cnclReqList.add(order);

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 프론트에서 필요한 부분 작업 필여
 		// 관리자 화면에서 사용하는 환불 칼럼 정보

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -494,8 +494,6 @@ public class TscConstants {
 //
 	// 포인트발생구분
 	public enum PointOccurGb {
-		USE_POINT("G069_10"),					// 포인트사용
-		USE_POINT_CANCEL("G069_11"),			// 포인트사용취소
 		EXPECT_POINT("G069_12"),				// 예정포인트적립
 		EXPECT_POINT_CANCEL("G069_13"),			// 예정포인트적립취소
 		REVIEW_POINT("G069_20"),				// 상품평포인트승인

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

@@ -2198,13 +2198,13 @@
 	
 	<!-- 마이페이지 사용포인트 원복 수정  -->
 	<update id="updateCustPointRollback" parameterType="Order">
-		/* TscOrderChange.createCustPointHstRollback */
+		/* TscOrderChange.updateCustPointRollback */
 		UPDATE TB_CUST_POINT
 		   SET US_PNT_AMT = US_PNT_AMT - #{pntAmt}
 		     , RM_PNT_AMT = RM_PNT_AMT + #{pntAmt}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
-		 WHERE CUST_PNT_SQ = #{CUST_PNT_SQ}
+		 WHERE CUST_PNT_SQ = #{custPntSq}
 	</update>
 
 	<!-- 마이페이지 상품쿠폰 원복 수정 -->
@@ -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>