Explorar el Código

주문서작업중

jsh77b hace 5 años
padre
commit
a1edf28600

+ 10 - 3
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -663,10 +663,10 @@ public class TscOrderService {
 	 * @author jsh77b
 	 * @author jsh77b
 	 * @since 2021. 02. 02
 	 * @since 2021. 02. 02
 	 */	
 	 */	
-	public Collection<Order> getCartDelvGoodsCntList(Collection<Order> cartGoodsList) {
+	public Order getCartDelvGoodsCntList(Collection<Order> cartGoodsList) {
 		
 		
 		// 1. 장바구니 상품 배송단위별 건수 체크 로직 (자사:총알배송, 자사:일반배송, 입점업체, 예약배송)
 		// 1. 장바구니 상품 배송단위별 건수 체크 로직 (자사:총알배송, 자사:일반배송, 입점업체, 예약배송)
-		String delvFeeCdTemp = "";
+		Order delvOrder = new Order();
 		
 		
 		int wmsCnt 	= 0;
 		int wmsCnt 	= 0;
 		int resCnt 	= 0;
 		int resCnt 	= 0;
@@ -681,16 +681,23 @@ public class TscOrderService {
 			// 1.1 배송정책별 상품 구분
 			// 1.1 배송정책별 상품 구분
 			if (order.getDelvFeeCd().equals("WMS")) {
 			if (order.getDelvFeeCd().equals("WMS")) {
 				wmsCartList.add(order);
 				wmsCartList.add(order);
+				wmsCnt++;
 			} 
 			} 
 			else if (order.getDelvFeeCd().equals("RES")) {
 			else if (order.getDelvFeeCd().equals("RES")) {
 				resCartList.add(order);
 				resCartList.add(order);
+				resCnt++;
 			} 
 			} 
 			else {
 			else {
 				delvCartList.add(order);
 				delvCartList.add(order);
+				delvCnt++;
 			}			
 			}			
 		}
 		}
 		
 		
-		return cartGoodsList;
+		delvOrder.setWmsCnt(wmsCnt);
+		delvOrder.setResCnt(resCnt);
+		delvOrder.setDelvCnt(delvCnt);
+				
+		return delvOrder;
 	}
 	}
 
 
 }
 }

+ 12 - 0
src/main/java/com/style24/persistence/domain/Order.java

@@ -1,5 +1,8 @@
 package com.style24.persistence.domain;
 package com.style24.persistence.domain;
 
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.TscPageRequest;
@@ -387,4 +390,13 @@ public class Order extends TscBaseDomain {
 	private int exchangeOrdDtlItemSq;
 	private int exchangeOrdDtlItemSq;
 	private String wdGb;
 	private String wdGb;
 	private int addPayCost;
 	private int addPayCost;
+	
+	// 주문서
+	private int wmsCnt;
+	private int resCnt;
+	private int delvCnt;
+	
+	Collection<Order> wmsCartList;
+	Collection<Order> resCartList;
+	Collection<Order> delvCartList;
 }
 }