修改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/adapter/OrderAdapter.java

@@ -19,12 +19,6 @@ import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
-import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
-import cn.freemud.entities.dto.order.CreateOrderAccountDto;
-import cn.freemud.entities.dto.order.CreateOrderProductDto;
-import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.*;
-import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.pay.OrderPayResponse;
@@ -71,7 +65,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
@@ -2418,14 +2411,23 @@ public class OrderAdapter {
     }
 
     public CreateOrderProductRequest convent2OrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
+        return this.conventCommonOrderProductDemo(cartGoodsDetailDto,null,0);
+    }
+
+
+    /**
+     *  公共转换提取
+     * @param cartGoodsDetailDto
+     * @param productType
+     * @param flag 0.平台普通订单 1.麦咖啡
+     * @return
+     */
+    private CreateOrderProductRequest conventCommonOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType, int flag){
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(StringUtils.isNotBlank(cartGoodsDetailDto.getSpuId()) ? cartGoodsDetailDto.getSpuId() : cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
-        createOrderProductDemoDto.setProductForeignName(cartGoodsDetailDto.getSpuForeignName());
-        createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
-        createOrderProductDemoDto.setSpecificationForeignName(cartGoodsDetailDto.getSkuForeignName());
         createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
@@ -2433,7 +2435,6 @@ public class OrderAdapter {
         createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
         createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
         createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
-        createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
@@ -2447,63 +2448,49 @@ public class OrderAdapter {
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
-        createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
-        createOrderProductDemoDto.setOpenId(cartGoodsDetailDto.getOpenId());
-        createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
-        createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
-        createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
         createOrderProductDemoDto.setIsSendGoods(cartGoodsDetailDto.getIsSendGoods());
+        createOrderProductDemoDto.setLinkedId(cartGoodsDetailDto.getLinkedId());
 
-        createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
-        createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
-        createOrderProductDemoDto.setScore(cartGoodsDetailDto.getScore());
-        createOrderProductDemoDto.setExtInfo(cartGoodsDetailDto.getExtInfo());
-        return createOrderProductDemoDto;
-    }
-
-    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType) {
-        CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
+        // 买咖啡的逻辑  代码提取
+        if (flag == 1) {
             createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
-        createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
-        createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
-        createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
-        createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
-        createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
-        createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
-        createOrderProductDemoDto.setNumber(cartGoodsDetailDto.getQty());
-        createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
-        createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
-        createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
             if (cartGoodsDetailDto.getIsTableware() == 0) {
                 createOrderProductDemoDto.setProductType(productType);
             } else {
                 createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
             }
-        createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
-        createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
-        createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
-        createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
-        createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
-        createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
-        createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
-        createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
-        createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
-        createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
-        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
-        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
+
             createOrderProductDemoDto.setSplitIndex(cartGoodsDetailDto.getSplitIndex());
             createOrderProductDemoDto.setProductGroupId(cartGoodsDetailDto.getProductGroupId());
-        createOrderProductDemoDto.setIsSendGoods(cartGoodsDetailDto.getIsSendGoods());
             if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
                 createOrderProductDemoDto.setSpecialAttrs(new ArrayList<>());
                 cartGoodsDetailDto.getSpecialExtra().stream().forEach(o -> {
                     createOrderProductDemoDto.getSpecialAttrs().add(new OrderSpecialExtraAttrRequest(o.getAttributeId(), o.getAttributeName(), o.getAttributeForeignName(), o.getSpecialCode()));
                 });
             }
+        }else {
+            createOrderProductDemoDto.setProductForeignName(cartGoodsDetailDto.getSpuForeignName());
+            createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
+            createOrderProductDemoDto.setSpecificationForeignName(cartGoodsDetailDto.getSkuForeignName());
+            createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+            createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
+            createOrderProductDemoDto.setOpenId(cartGoodsDetailDto.getOpenId());
+            createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
+            createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
+            createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
+            createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
+            createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
+            createOrderProductDemoDto.setScore(cartGoodsDetailDto.getScore());
+            createOrderProductDemoDto.setExtInfo(cartGoodsDetailDto.getExtInfo());
+        }
+
         return createOrderProductDemoDto;
     }
 
+    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType) {
+        return this.conventCommonOrderProductDemo(cartGoodsDetailDto,productType,1);
+    }
+
     public CreateOrderProductRequest getMcCafeWithOrderVirtualProduct(ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo createOrderVo) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(mccafeMonthCardGoodsId);

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