Merge branch 'feature/20210325-订单商品添加赠品字段-lcf'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2918,7 +2918,7 @@ public class OrderSdkAdapter {
         extInfo.setCartGoodsUid(product.getCartGoodsUid());
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());
-
+        extInfo.setIsSendGoods(product.getIsSendGoods());
         // 是否需要积分，农工商发送积分需要判断商品是否是送积分的商品
         // 发积分的操作移到消费者，所以这个值需要保存下来
         if(product.getNeedBonus() != null){

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -246,4 +246,9 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 虚拟商品使用，种子券号
      */
     private String cardCode;
+
+    /**
+     * 是否赠品
+     */
+    private Boolean isSendGoods;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -106,4 +106,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 虚拟商品种子券号
      */
     private String cardCode;
+
+    /**
+     * 是否赠品
+     */
+    private Boolean isSendGoods;
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2542,6 +2542,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
         createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
         createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
+        createOrderProductDemoDto.setIsSendGoods(cartGoodsDetailDto.getIsSendGoods());
 
         createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
         createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -264,6 +264,10 @@ public class ShoppingCartGoodsDto {
          * 月享卡加购信息
          */
         private MonthCardVo monthCardInfo;
+        /**
+         * 是否赠品
+         */
+        private Boolean isSendGoods;
 
         /**
          * 配料或属性

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/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -294,6 +294,10 @@ public class ShoppingCartGoodsDto {
          */
         private String classificationName;
 
+        /**
+         * 是否赠品
+         */
+        private Boolean isSendGoods;
 
         /**
          * 税率代码

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();

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);
 
     }

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

@@ -479,6 +479,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Integer orderType=updateShoppingCartGoodsQtyRequestVo.getOrderType();
         String receiveId = updateShoppingCartGoodsQtyRequestVo.getReceiveId();
 
+
         // 先验证商品是否存在
         CartGoods cartGoods = assortmentSdkService.getCartGoodsBySdk(partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService);
         if (cartGoods == null) {

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

@@ -379,7 +379,7 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
         cartGoodsDetailDto.setSkuForeignName(StringUtils.isEmpty(cartGoods.getSkuForeignName()) ? cartGoods.getSpuForeignName() : cartGoods.getSkuForeignName());
-
+        cartGoodsDetailDto.setIsSendGoods(ObjectUtils.equals(1, calculationGoods.getCartGoodType()));
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java

@@ -183,6 +183,7 @@ public class GiftSharingService {
                 cartGoodsDetailDto.setSpuName(product.getName());
                 cartGoodsDetailDto.setSkuId(goods.getGoodsId());
                 cartGoodsDetailDto.setSkuName(product.getName());
+                cartGoodsDetailDto.setIsSendGoods(ObjectUtils.equals(1, goods.getCartGoodType()));
                 cartGoodsDetailDto.setSalePrice(product.getOriginalPrice());
                 cartGoodsDetailDto.setPicture(product.getPicture());
                 cartGoodsDetailDto.setQty(goods.getGoodsQuantity());