Commit 1ef5a019 by 王世昌

fix null

parent 6d11c7b1
...@@ -49,7 +49,7 @@ public class CheckAdapter { ...@@ -49,7 +49,7 @@ public class CheckAdapter {
} }
for (int i = 0; i < cartGoodsList.size(); i++) { for (int i = 0; i < cartGoodsList.size(); i++) {
CartGoods cartGoods = cartGoodsList.get(i); CartGoods cartGoods = cartGoodsList.get(i);
if (CommonUtils.isProductCoupon(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid())) { if (!CommonUtils.isProductCoupon(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid())) {
continue; continue;
} }
String couponCode = CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid()); String couponCode = CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid());
...@@ -78,20 +78,13 @@ public class CheckAdapter { ...@@ -78,20 +78,13 @@ public class CheckAdapter {
if (useCoupon) { if (useCoupon) {
validCouponMap.put(couponCode + checkSpqInfo.getSkuId(), checkSpqInfo); validCouponMap.put(couponCode + checkSpqInfo.getSkuId(), checkSpqInfo);
} }
if (spqIdToCartUuid.containsKey(couponCode)) { List<String> uuidList = spqIdToCartUuid.computeIfAbsent(couponCode,k->new ArrayList<>());
List<String> uuidList = spqIdToCartUuid.get(couponCode); uuidList.add(cartGoods.getCartGoodsUid());
uuidList.add(cartGoods.getCartGoodsUid());
spqIdToCartUuid.put(couponCode, uuidList);
} else {
List<String> uuidList = new ArrayList<>();
uuidList.add(cartGoods.getCartGoodsUid());
spqIdToCartUuid.put(couponCode, uuidList);
}
addGoodsToShoppingCartBO.setSpqIdToCartUuidMap(spqIdToCartUuid);
addGoodsToShoppingCartBO.setValidCouponMap(validCouponMap);
} }
} }
addGoodsToShoppingCartBO.setSpqIdToCartUuidMap(spqIdToCartUuid);
addGoodsToShoppingCartBO.setValidCouponMap(validCouponMap);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment