修改pos推送商品信息

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

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

@@ -3151,6 +3151,9 @@ public class OrderSdkAdapter {
         if (product.getScore() != null) {
             extInfo.setScore(product.getScore());
         }
+        if (StringUtils.isNotBlank(product.getLinkedId())) {
+            extInfo.setLinkedId(product.getLinkedId());
+        }
         extInfo.setStapleFood(product.getStapleFood());
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());
         extInfo.setCartGoodsUid(product.getCartGoodsUid());

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

@@ -273,4 +273,9 @@ public class CreateOrderProductRequest extends BaseConfig {
     private Long score;
 
     private String extInfo;
+
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId;
 }

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

@@ -124,4 +124,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
 
     //积分商品活动使用总积分
     private Long score;
+
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId;
 }

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

@@ -343,6 +343,10 @@ public class ShoppingCartGoodsDto {
         private String originalGoodsUid;
 
         private String extInfo;
+        /**
+         *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+         */
+        private String linkedId;
 
         @Data
         public final static class CartGoodsExtra {

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

@@ -108,6 +108,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
         cartGoodsDetailDto.setOriginalGoodsUid(cartGoods.getOriginalGoodsUid());
         cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
+        cartGoodsDetailDto.setLinkedId(cartGoods.getLinkedId());
         cartGoodsDetailDto.setIsSendGoods((cartGoods.getIsSendGoods() !=null && cartGoods.getIsSendGoods()) ? true : false );
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());
@@ -686,6 +687,8 @@ public class ShoppingCartConvertAdapter {
 
             cartGoods.setTax(spuProduct.getTax());
             cartGoods.setTaxId(spuProduct.getTaxId());
+            // fisherman  订C，“POS编码”让凌顶那边去匹配商品  透传到订单上 保存到 orders_item 表的 extinfo里面
+            cartGoods.setLinkedId(spuProduct.getLinkedId());
             String skuSpecName = "";
             String skuForeignSpecName = "";
             if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {

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

@@ -62,7 +62,10 @@ public class ProductTypeBeanDTO {
     private List<PackageProductTypeDto> packageProductTypes;
     private List<ProductGroupType> additionalGroupList;
     private List<ProductComboDetailTypeDto> productComboInfos;
-
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId ="xxxxxx";
     public Integer getMemberDiscountResult() {
         return this.openMemberDiscount != null && this.openMemberDiscount == 1 ? this.memberDiscount : 100;
     }

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

@@ -110,6 +110,11 @@ public class ProductBean {
      */
     private List<BindingCouponTypeDto> productBindingCouponTypes;
 
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId;
+
     @NoArgsConstructor
     @Data
     public static class SpecificationGroupBean {

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

@@ -390,6 +390,12 @@ public class ShoppingCartGoodsDto {
          */
         private String extInfo;
 
+        /**
+         *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+         */
+        private String linkedId;
+
+
         @Data
         public final static class CartGoodsExtra {
             /**

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

@@ -343,6 +343,11 @@ public class CartGoods {
      */
     private List<MaterialGoods> productMaterialList;
 
+    /**
+     *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
+     */
+    private String linkedId;
+
     @Data
     public final static class CartGoodsExtra {
         /**

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

@@ -410,6 +410,7 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
         // fisherman
         cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
+        cartGoodsDetailDto.setLinkedId(cartGoods.getLinkedId());
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());
         cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());