添加赠品标识

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

@@ -2912,7 +2912,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

@@ -2531,6 +2531,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/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/service/impl/ShoppingCartNewServiceImpl.java

@@ -478,6 +478,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());