Merge branch 'feature-维护POS商品编码ID1039549-zxh-20211123' into qa

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -385,6 +385,10 @@ public class CartGoods {
     @Data
     public final static class ComboxGoods{
         /**
+         *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+         */
+        private String linkedId ;
+        /**
          * 单规格spuId,多规格skuId
          */
         private String goodsId;

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

@@ -163,6 +163,8 @@ public class ShoppingCartConvertAdapter {
                 comboProduct.setSpuId(comboxGoods.getSpuId());
                 comboProduct.setSpuName(comboxGoods.getSpuName());
                 comboProduct.setSkuId(comboxGoods.getGoodsId());
+                // fisherman 设置套餐商品 POS编码
+                comboProduct.setLinkedId(comboxGoods.getLinkedId());
                 // 设置原始商品类型
                 comboProduct.setOriginalProductType(comboxGoods.getOriginalProductType());
                 comboProduct.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
@@ -1401,10 +1403,12 @@ public class ShoppingCartConvertAdapter {
         GroupDetailType groupDetailType = new GroupDetailType();
         if (isComboxGoods) {
             productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductComboType());
+            comboxGoods.setLinkedId(productComboType.getLinkedId());
         } else {
             Map<String, GroupDetailType> map = new HashMap<>();
             parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
             groupDetailType = map.get(comboxGoods.getGoodsId());
+            comboxGoods.setLinkedId(groupDetailType.getLinkedId());
         }
 
         // 若是固定商品则取商品详情的FinalPrice，若是可选商品则取MarkUpPrice

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/info/GroupDetailType.java

@@ -21,5 +21,8 @@ public class GroupDetailType {
     private String taxId;
     private String foreignProductName;
     private Integer productType;
-
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId ;
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/info/ProductComboType.java

@@ -21,5 +21,8 @@ public class ProductComboType {
     private String taxId;
     private String foreignProductName;
     private Integer productType;
-
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId ;
 }

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

@@ -384,6 +384,10 @@ public class CartGoods {
     @Data
     public final static class ComboxGoods {
         /**
+         *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+         */
+        private String linkedId ;
+        /**
          * 单规格spuId,多规格skuId
          */
         private String goodsId;

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

@@ -574,6 +574,7 @@ public class CalculationCommonService {
             ShoppingCartGoodsDto.CartGoodsDetailDto com = new ShoppingCartGoodsDto.CartGoodsDetailDto();
             com.setSpuId(comb.getGoodsId());
             com.setSpuName(comb.getSpuName());
+            com.setLinkedId(comb.getLinkedId());
             com.setSpuForeignName(comb.getSpuForeignName());
             com.setSkuId(comb.getGoodsId());
             com.setSkuName(StringUtils.isEmpty(comb.getSkuName()) ? com.getSpuName() : com.getSkuName());