商品券

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/AddGoodsBOAdapter.java

@@ -109,7 +109,12 @@ public class AddGoodsBOAdapter {
         platformProductBO.setQty(qty);
         Integer goodsType = StringUtils.isEmpty(skuId)||ObjectUtils.equals(spuId,skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
-            goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
+            if (StringUtils.isNotBlank(skuId)){
+                goodsType = GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType();
+            } else {
+                goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
+            }
+
         } else if (CollectionUtils.isNotEmpty(baseRequestDTO.getProductComboList()) || CollectionUtils.isNotEmpty(baseRequestDTO.getProductGroupList())) {
             goodsType = GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType();
         }

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractAddGoodsService.java

@@ -221,13 +221,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
         if (baseRequestBO.getSpuId().startsWith(CommonsConstant.COUPON_PREFIX)) {
             CartGoods cartGoods = baseRequestBO.getAddGoods();
             cartGoods.setCartGoodsUid(baseRequestBO.getSpuId());
-            // 设置商品类型为商品券
-            if (CouponTypeEnum.TYPE_4.getCode().equals(getProductBO.getCouponType())) {
-                cartGoods.setGoodsType(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType());
-            } else {
-                cartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
-            }
-
             cartGoods.setOriginalPrice(spqBO.getProductPrice());
 
             // 商品券Id
@@ -250,7 +243,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             cartGoods.setUnit(productsInfo.getUnit());
             cartGoods.setSpuName(productsInfo.getName());
             cartGoods.setCouponProductPrice(productsInfo.getFinalPrice());
-            cartGoods.setActivityCode(getProductBO.getActivityCode());
             boolean stockLimit = false;
             if (productsInfo.getType() == ProductType.NOSPEC.getCode()
                     && productsInfo.getStockLimit() == 1) {

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformAddGoodsService.java

@@ -79,7 +79,7 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
                     } else {
                         this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
@@ -176,6 +176,7 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
                 if (null == checkSpqInfo) {
                     cartGoodsList.remove(i);
                 } else {
+                    cartGoods.setActivityCode(checkSpqInfo.getActiveCode());
                     cartGoods.setCouponProductPrice(checkSpqInfo.getPrice());
                 }
             }