jsh77b 5 年之前
父節點
當前提交
c514ac8aea

+ 17 - 5
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -665,26 +665,38 @@ public class TscOrderService {
 			for (Order goodsCartCpnApply : goodsCartCpnApplyList) {
 				// 상품쿠폰목록
 				if ("G230_11".equals(goodsCartCpnApply.getCpnType())) {
-					goodsCpnList.add(goodsCartCpnApply);
-				} 
+					Boolean temp1 = true;
+					for (Order goodsCpn : goodsCpnList) {
+						if (goodsCpn.getCpnId() == goodsCartCpnApply.getCpnId()) {
+							temp1 = false;
+						}
+					}
+					
+					// 쿠폰시퀀스가 중복 없을때 적용
+					if (temp1) {
+						goodsCpnList.add(goodsCartCpnApply);
+					}
+				}
 				// 장바구니쿠폰목록
 				else if ("G230_20".equals(goodsCartCpnApply.getCpnType())) {
 					
-					Boolean temp = true;
+					Boolean temp2 = true;
 					for (Order cartCpn : cartCpnList) {
 						if (cartCpn.getCpnId() == goodsCartCpnApply.getCpnId()) {
-							temp = false;
+							temp2 = false;
 						}
 					}
 					
 					// 쿠폰시퀀스가 중복 없을때 적용
-					if (temp) {
+					if (temp2) {
 						cartCpnList.add(goodsCartCpnApply);
 					}
 				}
 			}
 		}
 		
+		log.info("goodsCpnList.size() ---> {}", goodsCpnList.size());
+		
 		resultMap.set("goodsCpnList"	, goodsCpnList);
 		resultMap.set("cartCpnList"		, cartCpnList);
 		

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -2004,6 +2004,7 @@
 			 , CP.DC_AVAL
 			 , CP.MAX_DC_AMT
 			 , CP.BUY_LIMIT_AMT
+			 , CP.APPLY_SCOPE
 		ORDER  BY Z.GOODS_CD
 		        , CP.CPN_ID
 	</select>