新增 新算价 加价购,买赠等支持 pos编码记录

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -55,5 +55,9 @@ public class GetProductsVo {
      */
     private List<BindingCouponTypeDto> productBindingCouponTypes;
 
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId;
 
 }
\ No newline at end of file

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

@@ -100,6 +100,7 @@ public class PlatformActiveServiceImpl implements ActiveService {
             CartGoods cartGood = new CartGoods();
             cartGood.setGoodsId(goods.getGoodsId());
             cartGood.setGoodsType(1);
+            cartGood.setLinkedId(product.getLinkedId());
             cartGood.setSpuId(Objects.equals(product.getIsSkuProduct(), 1) ? product.getSpecProductId() : goods.getGoodsId());
             cartGood.setSkuId(goods.getGoodsId());
             cartGood.setOriginalPrice(product.getFinalPrice());

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

@@ -154,6 +154,7 @@ public class ItemServiceImpl implements ItemService {
             productInfosDto.getData().getProducts().stream().forEach(productBean -> {
                 //多规格获取sku信息
                 GetProductsVo getProductsVo = new GetProductsVo();
+                getProductsVo.setLinkedId(productBean.getLinkedId());
                 getProductsVo.setSkuId(productBean.getPid());
                 getProductsVo.setSkuName(productBean.getName());
                 String picture = CollectionUtils.isNotEmpty(productBean.getProductPictureList())

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

@@ -17,7 +17,6 @@ import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -312,9 +311,10 @@ public class AdditionSharingService {
         cartGoodsDetailDto.setSpuId(product.getSpuId());
         cartGoodsDetailDto.setSkuId(goodsId);
         cartGoodsDetailDto.setQty(product.getQty());
-        cartGoodsDetailDto.setSpuName(getProductsVo != null ? getProductsVo.getSpuName() : "");
+        cartGoodsDetailDto.setLinkedId(getProductsVo.getLinkedId());
+        cartGoodsDetailDto.setSpuName(getProductsVo.getSpuName());
         cartGoodsDetailDto.setSkuName(product.getSkuName());
-        cartGoodsDetailDto.setPicture(getProductsVo != null ? getProductsVo.getSpuPicture() : "");
+        cartGoodsDetailDto.setPicture(getProductsVo.getSpuPicture());
         cartGoodsDetailDto.setActivityType(ActivityTypeEnum.TYPE_81.getCode());
         cartGoodsDetailDto.setClassificationId(getProductsVo.getCategory());
         cartGoodsDetailDto.setClassificationName(getProductsVo.getCategoryName());