주문금액 유효성 체크 보완

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -2224,62 +2224,66 @@ public class TsfOrderService {
 		int ordAmt = 0;
 		
 		for (Order od : tmtbGoodsApplyList) {
-			log.info("----------------------------------------------------------------------------");
-			
 			// 주문금액설정
 			ordAmt = (od.getCurrPrice() + od.getOptAddPrice()) * od.getGoodsQty();
 			od.setOrdAmt(ordAmt);
-						
-			log.info("cartSq ::: {}"			, od.getCartSq());
-			log.info("orgCurrPrice ::: {}"		, od.getOrgCurrPrice());
-			log.info("cpn1DcAmt ::: {}"			, od.getOrgCurrPrice() - od.getCurrPrice());
-			log.info("optAddPrice ::: {}"		, od.getOptAddPrice());
-			log.info("goodsQty ::: {}"			, od.getGoodsQty());
-			log.info("ordAmt ::: {}"			, od.getOrdAmt());
-			log.info("tmtb1DcAmt ::: {}"		, od.getTmtb1DcAmt());
-			log.info("tmtb2DcAmt ::: {}"		, od.getTmtb2DcAmt());
-			log.info("prePntDcAmt ::: {}"		, od.getPrePntDcAmt());
-			log.info("pntPrate ::: {}"			, od.getPntPrate());
-			log.info("pntMrate ::: {}"			, od.getPntMrate());
 			
-			// 상품쿠폰, 장바구니쿠폰 적용
+			// 상품쿠폰시퀀스, 장바구니쿠폰시퀀스 적용
 			for (Order vo : orderDetailList) {
 				if (od.getCartSq().equals(vo.getCartSq())) {
-					log.info("vo.getCartSq() ----> {}", vo.getCartSq());
-					log.info("vo.getGoodsCpnSq() ----> {}", vo.getGoodsCpnSq());
-					log.info("vo.getCartCpnSq() ----> {}", vo.getCartCpnSq());
-					log.info("vo.getPntDcAmt() ----> {}", vo.getPntDcAmt());
-					log.info("vo.getGfcdUseAmt() ----> {}", vo.getGfcdUseAmt());
-					
 					od.setGoodsCpnSq(vo.getGoodsCpnSq());
 					od.setCartCpnSq(vo.getCartCpnSq());
+					od.setPrePntDcAmtYn(vo.getPrePntDcAmtYn());
 					od.setPntDcAmt(vo.getPntDcAmt());
 					od.setGfcdUseAmt(vo.getGfcdUseAmt());
 				}
 			}
-			
-			log.info("pntDcAmt ::: {}"			, od.getPntDcAmt());
-			log.info("gfcdUseAmt ::: {}"		, od.getGfcdUseAmt());
-			log.info("----------------------------------------------------------------------------");
 		}
 		
 		// 상품쿠폰, 장바구니쿠폰 적용 금액
-		for (Order od : tmtbGoodsApplyList) {
-			log.info("----------------------------------------------------------------------------");	
+		for (Order od : tmtbGoodsApplyList) {	
 			for (Order tmtbGoods : goodsApplyCpnList) {
 				if (od.getCartSq().equals(tmtbGoods.getCartSq())) {
-					log.info("vo.getCartSq() ::: {}", od.getCartSq());
 					for (Order goodsCpn : tmtbGoods.getGoodsCpnList()) {
 						if (od.getGoodsCpnSq() == goodsCpn.getCustCpnSq()) {
-							log.info("vo.getGoodsCpnSq() ::: {}", od.getGoodsCpnSq());
-							log.info("goodsCpn.getCpnDcAmt() ::: {}", goodsCpn.getCpnDcAmt());
-							
 							od.setGoodsCpnDcAmt(goodsCpn.getCpnDcAmt());
 						}
 					}
 				}
 			}
+		}
+		
+		
+		// 상품쿠폰, 장바구니쿠폰 적용 금액
+		int ordDcSumAmt 	= 0;
+		int ordDcAmt 		= 0;
+		
+		for (Order od : tmtbGoodsApplyList) {
+			log.info("----------------------------------------------------------------------------");
+			log.info("cartSq ::: {}"			, od.getCartSq());
+			log.info("orgCurrPrice ::: {}"		, od.getOrgCurrPrice());
+			log.info("cpn1DcAmt ::: {}"			, od.getOrgCurrPrice() - od.getCurrPrice());
+			log.info("optAddPrice ::: {}"		, od.getOptAddPrice());
+			log.info("goodsQty ::: {}"			, od.getGoodsQty());
+			log.info("ordAmt ::: {}"			, od.getOrdAmt());
+			log.info("tmtb1DcAmt ::: {}"		, od.getTmtb1DcAmt());
+			log.info("tmtb2DcAmt ::: {}"		, od.getTmtb2DcAmt());
+			log.info("prePntDcAmt ::: {}"		, od.getPrePntDcAmt());
+			log.info("goodsCpnDcAmt ::: {}"		, od.getGoodsCpnDcAmt());
+			log.info("pntDcAmt ::: {}"			, od.getPntDcAmt());
+			log.info("gfcdUseAmt ::: {}"		, od.getGfcdUseAmt());
+			log.info("pntPrate ::: {}"			, od.getPntPrate());
+			log.info("pntMrate ::: {}"			, od.getPntMrate());
 			
+			if ("Y".equals(od.getPrePntDcAmtYn())) {
+				ordDcAmt = od.getOrdAmt() - od.getTmtb1DcAmt() - od.getTmtb2DcAmt() - od.getGoodsCpnDcAmt()  - od.getPrePntDcAmt();
+			} else {
+				ordDcAmt = od.getOrdAmt() - od.getTmtb1DcAmt() - od.getTmtb2DcAmt() - od.getGoodsCpnDcAmt();
+			}
+
+			ordDcSumAmt = ordDcSumAmt + ordDcAmt;
+			
+			/*
 			for (Order cartCpn : cartCpnList) {
 				if (od.getCartCpnSq() == cartCpn.getCustCpnSq()) {
 					for (int i=0 ; i<cartCpn.getCartCpnCartSqArr().length ; i++) {
@@ -2294,9 +2298,10 @@ public class TsfOrderService {
 					}
 				}
 			}
+			*/
+			
 			log.info("----------------------------------------------------------------------------");	
 		}
-		
 		return result;
 	}