老算价赠品

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -46,7 +46,7 @@ import tk.mybatis.spring.annotation.MapperScan;
         "com.freemud.api.assortment.datamanager.queue.dao",
         "com.freemud.api.assortment.datamanager.rbac",
         "com.freemud.api.assortment.datamanager.manager"})
-@EnableFeignClients
+// @EnableFeignClients
 @EnableAsync
 public class ShoppingCartApplication {
     private static final String GRAY_VERSION_PROD = "PROD"; //生产版本

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

@@ -195,6 +195,10 @@ public class CartGoods {
      * 麦咖啡定制属性
      */
     private List<SpecialExtra> specialExtra;
+    /**
+     * 是否赠品
+     */
+    private Boolean isSendGoods;
 
     /**
      * 创建时间（mili）

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

@@ -96,6 +96,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
                 // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
                 cartGoods.setNodeId(sendActivity.getActivityCode());
                 cartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());
+                cartGoods.setIsSendGoods(true);
+
                 this.setGiftExtra(cartGoods,product,cartGoodsList);
                 cartGoodsList.add(cartGoods);
                 totalGiftAmount += product.getFinalPrice() * sendGoods.getSendNumber();