商品券

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

@@ -230,7 +230,8 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             cartGoods.setName(spqBO.getCouponName());
             cartGoods.setSpuName(spqBO.getSpuName());
             cartGoods.setGoodsId(baseRequestBO.getSpuId());
-            cartGoods.setSpuId(spqBO.getSpuId());
+            String spqId = baseRequestBO.getSpuId().substring(CommonsConstant.COUPON_PREFIX.length());
+            cartGoods.setSpuId(spqId);
             cartGoods.setSkuId(StringUtils.isEmpty(spqBO.getSkuId()) ? spqBO.getSpuId() : spqBO.getSkuId());
             cartGoods.setOriginalPrice(0L);
             cartGoods.setOriginalAmount(spqBO.getProductPrice());

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

@@ -7,12 +7,14 @@ import cn.freemud.demo.entities.bo.promotion.GetActivityBO;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.manager.promotion.PromotionManager;
 import cn.freemud.demo.service.DistributeService;
+import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.CalculationGoodsType;
 import cn.freemud.enums.GoodsTypeEnum;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,12 @@ public class DistributeServiceImpl implements DistributeService {
         long originalAmount = 0L, amount = 0L, packageAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             originalAmount = 0L;amount = 0L;packageAmount = 0L;
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)){
+                Map<String, CheckSpqInfoResponseDto> validCouponMap = discountResult.getValidCouponMap();
+                if (validCouponMap != null && validCouponMap.get(cartGoods.getSpuId()) != null){
+                    cartGoods.setSpuId(validCouponMap.get(cartGoods.getSpuId()).getSpuId());
+                }
+            }
 
             //原价行记录
             originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();

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.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
                     } else {
                         this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
@@ -178,6 +178,8 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
                 } else {
                     cartGoods.setActivityCode(checkSpqInfo.getActiveCode());
                     cartGoods.setCouponProductPrice(checkSpqInfo.getPrice());
+                    validCouponMap.put(spqId, checkSpqInfo);
+                    addGoodsToShoppingCartBO.setValidCouponMap(validCouponMap);
                 }
             }
         }