Commit ba6117ef by 周晓航

维护 优惠券商品的 pos编码

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent ed3908bd
...@@ -2216,25 +2216,27 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2216,25 +2216,27 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
private void addProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo private void addProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo
, CartGoods cartGoods, String spuId2, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String spuId , CartGoods cartGoods, String spuId2, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String spuId
, List<CartGoods> allCartGoodsList, List<ProductBean> productBeanListSpuClass, CouponProductDto couponProductDto, String couponCode, Integer todayAvailableTimes) { , List<CartGoods> allCartGoodsList, List<ProductBean> productBeanListSpuClass, CouponProductDto couponProductDto, String couponCode, Integer todayAvailableTimes) {
ProductBean productBean = productBeanListSpuClass.get(0);
cartGoods.setSkuId(spuId2); cartGoods.setSkuId(spuId2);
cartGoods.setOriginalPrice(0L); cartGoods.setOriginalPrice(0L);
cartGoods.setOriginalAmount(0L); cartGoods.setOriginalAmount(0L);
cartGoods.setAmount(0L); cartGoods.setAmount(0L);
cartGoods.setPackPrice(productBeanListSpuClass.get(0).getPackPrice().longValue()); cartGoods.setPackPrice(productBean.getPackPrice());
cartGoods.setPic(productBeanListSpuClass.get(0).getPicture()); cartGoods.setPic(productBean.getPicture());
cartGoods.setWeight(productBeanListSpuClass.get(0).getWeight()); cartGoods.setWeight(productBean.getWeight());
cartGoods.setUnit(productBeanListSpuClass.get(0).getUnit()); cartGoods.setUnit(productBean.getUnit());
// 券商品 设置商品原始类型 // 券商品 设置商品原始类型
cartGoods.setOriginalProductType(productBeanListSpuClass.get(0).getType()); cartGoods.setOriginalProductType(productBean.getType());
cartGoods.setLinkedId(productBean.getLinkedId());
// 设置商品类型为商品券 // 设置商品类型为商品券
if (CouponTypeEnum.TYPE_4.getCode().equals(couponProductDto.getType())) { if (CouponTypeEnum.TYPE_4.getCode().equals(couponProductDto.getType())) {
cartGoods.setGoodsType(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType()); cartGoods.setGoodsType(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType());
} else if (CouponTypeEnum.TYPE_7.getCode().equals(couponProductDto.getType())) { } else if (CouponTypeEnum.TYPE_7.getCode().equals(couponProductDto.getType())) {
cartGoods.setGoodsType(GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType()); cartGoods.setGoodsType(GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType());
cartGoods.setOriginalPrice(productBeanListSpuClass.get(0).getOriginalPrice()); cartGoods.setOriginalPrice(productBean.getOriginalPrice());
cartGoods.setAmount(productBeanListSpuClass.get(0).getFinalPrice()); cartGoods.setAmount(productBean.getFinalPrice());
cartGoods.setSkuName(productBeanListSpuClass.get(0).getName()); cartGoods.setSkuName(productBean.getName());
} else { } else {
cartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType()); cartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
} }
...@@ -2255,11 +2257,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2255,11 +2257,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
} }
boolean stockLimit = false; boolean stockLimit = false;
if (productBeanListSpuClass.get(0).getType() == ProductType.NOSPEC.getCode() if (productBean.getType() == ProductType.NOSPEC.getCode()
&& productBeanListSpuClass.get(0).getStockLimit() == 1) { && productBean.getStockLimit() == 1) {
stockLimit = true; stockLimit = true;
} else { } else {
for (SkuProductBean skuProductBean : productBeanListSpuClass.get(0).getSkuList()) { for (SkuProductBean skuProductBean : productBean.getSkuList()) {
if (spuId2.equals(skuProductBean.getSkuId()) && skuProductBean.getStockLimit() == 1) { if (spuId2.equals(skuProductBean.getSkuId()) && skuProductBean.getStockLimit() == 1) {
stockLimit = true; stockLimit = true;
break; break;
......
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