Skip to content

O
order-group
Commit 7f5c505d by 孙昱
Options

Merge branch 'feature-yu.sun-getCartInfoByUser-20200925' into qa

parents ba174a44 104e3a5f
Showing with 22 additions and 22 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
...@@ -344,28 +344,28 @@ public class CouponDiscountCalculation { ...@@ -344,28 +344,28 @@ public class CouponDiscountCalculation {
productList.add(couponProductVo); productList.add(couponProductVo);
} }
if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) { // if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
cartGood.getProductComboList().forEach(comboxGoods -> { // cartGood.getProductComboList().forEach(comboxGoods -> {
CouponProductVo couponProductVo = new CouponProductVo(); // CouponProductVo couponProductVo = new CouponProductVo();
couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString())); // couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode()); // couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
couponProductVo.setQuantity(comboxGoods.getQty()); // couponProductVo.setQuantity(comboxGoods.getQty());
couponProductVo.setProductId(comboxGoods.getGoodsId()); // couponProductVo.setProductId(comboxGoods.getGoodsId());
couponProductVo.setCategoryCode(null); // couponProductVo.setCategoryCode(null);
productList.add(couponProductVo); // productList.add(couponProductVo);
}); // });
} // }
if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) { // if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
cartGood.getProductGroupList().forEach(comboxGoods -> { // cartGood.getProductGroupList().forEach(comboxGoods -> {
CouponProductVo couponProductVo = new CouponProductVo(); // CouponProductVo couponProductVo = new CouponProductVo();
couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString())); // couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode()); // couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
couponProductVo.setQuantity(comboxGoods.getQty()); // couponProductVo.setQuantity(comboxGoods.getQty());
couponProductVo.setProductId(comboxGoods.getGoodsId()); // couponProductVo.setProductId(comboxGoods.getGoodsId());
couponProductVo.setCategoryCode(null); // couponProductVo.setCategoryCode(null);
productList.add(couponProductVo); // productList.add(couponProductVo);
}); // });
} // }
}); });
res.setProductList(productList); res.setProductList(productList);
Long totalAmount = createProductRequest(cartGoods, productList); Long totalAmount = createProductRequest(cartGoods, productList);
......
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