Merge branch 'develop' into bin2107

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/TscOrderChangeService.java

@@ -292,13 +292,15 @@ public class TscOrderChangeService {
 						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.ORD_USE_POINT_CANCEL.value());
@@ -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,12 @@ public class TscOrderChangeService {
 				pg.setPgTid(pgTid);
 				pg.setPayMeans(payMeans);
 				pg.setPartCancelAmt(spanRefundAmt);
+				// pg.setLeftAmt(orderChangeDao.getLeftAmt(ordNo));
 				pg.setLeftAmt(payAmt);
 				pg.setRegNo(userNo);
 				pg.setUpdNo(userNo);
-
+				log.info("cancelAmt >>> {}", pg.getPartCancelAmt());
+				log.info("leftAmt >>> {}", pg.getLeftAmt());
 				if (spanRefundAmt > 0) {
 					pgList.add(pg);
 				}
@@ -707,7 +713,7 @@ public class TscOrderChangeService {
 						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;
@@ -750,7 +756,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;
@@ -2517,6 +2523,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/biz/service/TscOrderService.java

@@ -1487,7 +1487,7 @@ public class TscOrderService {
 					orderDetailItem.setSavePntAmt((orderDetail.getSavePntAmt() * tempDiv) / 100);
 					orderDetailItem.setRealOrdAmt((orderDetail.getRealOrdAmt() * tempDiv) / 100);
 					orderDetailItem.setGfcdUseAmt((orderDetail.getGfcdUseAmt() * tempDiv) / 100);
-					
+										
 					leftOrdAmt 			= leftOrdAmt 			- ((orderDetail.getOrdAmt() * tempDiv) / 100);
 					leftCpn1DcAmt 		= leftCpn1DcAmt 		- ((orderDetail.getCpn1DcAmt() * tempDiv) / 100);
 					leftTmtb1DcAmt 		= leftTmtb1DcAmt 		- ((orderDetail.getTmtb1DcAmt() * tempDiv) / 100);
@@ -1501,6 +1501,8 @@ public class TscOrderService {
 					leftGfcdUseAmt 		= leftGfcdUseAmt 		- ((orderDetail.getGfcdUseAmt() * tempDiv) / 100);
 				}
 				
+				// 2021.05.06 옵션금액 단품 추가
+				orderDetailItem.setOptAddPrice(optAddPrice);
 				orderDetailItem.setCustNo(order.getCustNo());
 
 				orderDao.createOrderDetailItem(orderDetailItem); // 주문상세단품정보등록

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

@@ -2492,7 +2492,7 @@
 		     , G.CURR_PRICE 
 		     , IFNULL(GC.QTY, 1)                            AS ITEM_QTY
 		     , IFNULL(GC.COMPS_CURR_PRICE, G.CURR_PRICE)    AS ITEM_PRICE
-		     , OP.ADD_PRICE 
+		     , OP.ADD_PRICE                                 AS OPT_ADD_PRICE
 		     , CD.DISP_ORD 
 		     , 0                                            AS ORD_AMT
 		     , 0                                            AS CNCL_RTN_AMT

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>