|
|
@@ -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);
|
|
|
|