주문서개발중

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

@@ -701,6 +701,13 @@ public class TscOrderService {
 		return orderDao.getDelvCpnList(order);
 	}
 	
+	/**
+	 * 상품단위 상품쿠폰 등록 
+	 *
+	 * @param Order
+	 * @author jsh77b
+	 * @since 2021. 02. 02
+	 */
 	public Collection<Order> getGoodsCpnApplyList(Collection<Order> tmtbGoodsApplyList, Collection<Order> goodsCpnAllList) {
 		Collection<Order> goodsApplyCpnList = new ArrayList<Order>();
 		
@@ -772,6 +779,32 @@ public class TscOrderService {
 		return goodsApplyCpnList;
 	}
 	
+	/**
+	 * 장바구니쿠폰단위 상품 등록 
+	 *
+	 * @param Order
+	 * @author jsh77b
+	 * @since 2021. 02. 02
+	 */
+	public Collection<Order> getCartCpnApplyList(Collection<Order> tmtbGoodsApplyList, Collection<Order> cartCpnAllList) {
+		Collection<Order> cartApplyCpnList = new ArrayList<Order>();
+		
+		// 1. 쿠폰대상이 있는 상품만 정리
+		for (Order cartCpn : cartCpnAllList) {
+			List<Order> cartCpnGoodsList = new ArrayList<Order>();
+			
+			for (Order tmtbGoods : tmtbGoodsApplyList) {
+				if ("A".equals(cartCpn.getApplyScope()) || tmtbGoods.getGoodsCd().equals(cartCpn.getGoodsCd())) {
+					cartCpnGoodsList.add(tmtbGoods);
+				}
+			}
+			cartCpn.setCartCpnGoodsList(cartCpnGoodsList);
+			cartApplyCpnList.add(cartCpn);
+		}
+		
+		return cartApplyCpnList;
+	}
+	
 	// 쿠폰할인금액이 높은순으로 정렬 함수
 	private List<Order> getListSort(List<Order> goodsCpnList) {
 		int cnt 			= 0;
@@ -845,7 +878,6 @@ public class TscOrderService {
 			// 다다익선 할인금액이 있을때 적용
 			if (tmtbGoodsApply.getTmtbDcAmt() > 0) {
 				tmtbDcSumAmt = tmtbDcSumAmt + (((tmtbGoodsApply.getCurrPrice() + tmtbGoodsApply.getOptAddPrice()) * tmtbGoodsApply.getGoodsQty()) - tmtbGoodsApply.getTmtbDcAmt());
-				log.info("tmtbDcSumAmt ::: {}", tmtbDcSumAmt);
 			}
 		}
 

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

@@ -51,7 +51,8 @@ public class Order extends TscBaseDomain {
 	private String formalGbNm;						// 정상,이월구분명
 	private String goodsType;						// 상품타입
 	private int listPrice;							// 정상가
-	private int currPrice;							// 판매가
+	private int currPrice;							// 판매가 (1차쿠폰적용가능가)
+	private int orgCurrPrice;						// 판매가
 	private double dcRate;							// 할인율
 	private int optAddPrice;						// 옵션추가금액
 	private int ordQty;								// 주문수량
@@ -414,6 +415,7 @@ public class Order extends TscBaseDomain {
 	Collection<Order> resCartList;
 	Collection<Order> delvCartList;
 	List<Order> goodsCpnList;
+	List<Order> cartCpnGoodsList;
 	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private int[] freegiftSqArr;

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

@@ -1643,6 +1643,7 @@
 			 , Z.MIN_ORD_AMT
 			 , Z.DELV_FEE
 			 , Z.CURR_PRICE
+			 , Z.ORG_CURR_PRICE
 			 , Z.OPT_ADD_PRICE
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
@@ -1690,6 +1691,8 @@
 					 , DFP.DELV_FEE
 					 , VS.CURR_STOCK_QTY
 					 , FN_GET_APPLY_CPN1_PRICE(CA.GOODS_CD, #{frontGb}) AS CURR_PRICE
+					 , G.CURR_PRICE AS ORG_CURR_PRICE
+					 , FN_GET_APPLY_CPN1_ID(CA.GOODS_CD, #{frontGb}) AS CPN1_CPN_SQ
 					 , IFNULL(OP.ADD_PRICE, 0) AS OPT_ADD_PRICE
 					 , CASE WHEN G.SELF_GOODS_YN = 'Y' AND G.GOODS_TYPE != 'G056_S' THEN CD.OPT_CD1
 							ELSE '00' END AS COLOR_CD