商品券显示问题

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

@@ -234,6 +234,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             cartGoods.setPic(productsInfo.getPicture());
             cartGoods.setWeight(productsInfo.getWeight());
             cartGoods.setUnit(productsInfo.getUnit());
+            cartGoods.setCouponProductPrice(productsInfo.getFinalPrice());
             cartGoods.setActivityCode(getProductBO.getActivityCode());
             boolean stockLimit = false;
             if (productsInfo.getType() == ProductType.NOSPEC.getCode()

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

@@ -71,13 +71,13 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
             else {//商品券->商品券ID换取商品
                 String goodsId = StringUtils.isNotBlank(cartGoods.getSkuId()) ? cartGoods.getSkuId() : cartGoods.getSpuId();
                 GetCalculationDiscountBO.CalculationDiscountCoupon coupon = new GetCalculationDiscountBO.CalculationDiscountCoupon();
-                coupon.setCode(cartGoods.getCouponCode());
+                coupon.setCode(cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), cartGoods.getSpuId());
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
                     } else {
-                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), null);
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
             }
         }

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

@@ -104,13 +104,13 @@ public class PlatformApportionService extends AbstractApportionService {
             else {//商品券->商品券ID换取商品
                 String goodsId = StringUtils.isNotBlank(cartGoods.getSkuId()) ? cartGoods.getSkuId() : cartGoods.getSpuId();
                 GetCalculationDiscountBO.CalculationDiscountCoupon coupon = new GetCalculationDiscountBO.CalculationDiscountCoupon();
-                coupon.setCode(cartGoods.getCouponCode());
+                coupon.setCode(cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), cartGoods.getSpuId());
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
                 } else {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), null);
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
             }
         }

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

@@ -115,13 +115,13 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
             else {//商品券->商品券ID换取商品
                 String goodsId = StringUtils.isNotBlank(cartGoods.getSkuId()) ? cartGoods.getSkuId() : cartGoods.getSpuId();
                 GetCalculationDiscountBO.CalculationDiscountCoupon coupon = new GetCalculationDiscountBO.CalculationDiscountCoupon();
-                coupon.setCode(cartGoods.getCouponCode());
+                coupon.setCode(cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), cartGoods.getSpuId());
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
                 } else {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), null);
+                    this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
             }
         }

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

@@ -83,13 +83,13 @@ public class PlatformUpdateGoodsQtyService extends AbstractUpdateGoodsQtyService
             else {//商品券->商品券ID换取商品
                 String goodsId = StringUtils.isNotBlank(cartGoods.getSkuId()) ? cartGoods.getSkuId() : cartGoods.getSpuId();
                 GetCalculationDiscountBO.CalculationDiscountCoupon coupon = new GetCalculationDiscountBO.CalculationDiscountCoupon();
-                coupon.setCode(cartGoods.getCouponCode());
+                coupon.setCode(cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()));
                 coupon.setActivityCode(cartGoods.getActivityCode());
                 coupons.add(coupon);
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), cartGoods.getSpuId());
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), cartGoods.getSpuId());
                     } else {
-                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getOriginalPrice(), null);
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, cartGoods.getCouponProductPrice(), null);
                 }
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -124,6 +124,10 @@ public class CartGoods {
      */
     private Long finalPrice;
     /**
+     * 购物车商品券商品价格
+     */
+    private Long couponProductPrice;
+    /**
      * 小料总金额
      */
     private Long materialAmount;