老算价赠品

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

@@ -95,6 +95,8 @@ public class ShoppingCartConvertAdapter {
         // 设置基础信息
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
+        cartGoodsDetailDto.setOriginalGoodsUid(cartGoods.getOriginalGoodsUid());
+        cartGoodsDetailDto.setIsSendGoods((cartGoods.getIsSendGoods() !=null && cartGoods.getIsSendGoods()) ? true : false );
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());
         cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());

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

@@ -264,6 +264,7 @@ public class BuySendPromotionService implements IPromotionService {
         }
         String s = currentSubName(cartGood);
         CartGoods newCartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
+        newCartGoods.setCartGoodsUid(UUID.randomUUID().toString());
         newCartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());
         newCartGoods.setClassificationId(cartGood.getClassificationId());
         newCartGoods.setClassificationName(cartGood.getClassificationName());
@@ -271,6 +272,7 @@ public class BuySendPromotionService implements IPromotionService {
         //赠品不允许有加料
         newCartGoods.setProductMaterialList(new ArrayList());
         newCartGoods.setSubName(s);
+        newCartGoods.setIsSendGoods(true);
         newCartGoodsList.add(newCartGoods);
 
     }