Merge branch '20210928-美团POS支持-zhiwei.zha' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -3104,7 +3104,6 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setProductCode(product.getProductCode());
         orderItemCreateReq.setCategoryId(product.getCategoryId());
         orderItemCreateReq.setCategoryName(product.getCategoryName());
-        orderItemCreateReq.setThirdCategoryCode(product.getThirdCategoryId());
         //套餐商品
         if (StringUtils.isNotEmpty(parentProductId)) {
             orderItemCreateReq.setParentProductId(parentProductId); //套餐类商品父级商品id
@@ -3153,7 +3152,6 @@ public class OrderSdkAdapter {
             extInfo.setScore(product.getScore());
         }
         extInfo.setStapleFood(product.getStapleFood());
-        extInfo.setThirdSpuProductId(product.getSpuCustomerCode());
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());
         extInfo.setCartGoodsUid(product.getCartGoodsUid());
         // todo 订单行扩展字段商品组

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

@@ -62,10 +62,6 @@ public class CreateOrderProductRequest extends BaseConfig {
      */
     private String customerCode;
     /**
-     * 多规格对应的父级商品的三方编号
-     */
-    private String spuCustomerCode;
-    /**
      * 商品货号，商品服务可重复
      */
     private String productCode;

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

@@ -37,11 +37,6 @@ public class OrderProductAddInfoDto extends BaseConfig {
     private Boolean isFixedProduct;
 
     /**
-     * 商品Spu级的第三方id（多规格SPU级的三方id）
-     */
-    private String thirdSpuProductId;
-
-    /**
      * 第三方商品规格ID
      */
     private String thirdProductSpecId;

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

@@ -247,10 +247,6 @@ public class CartGoods {
      */
     private String categoryName;
     /**
-     * 第三方的分类编码 第三方使用
-     */
-    private String customerCategoryCode;
-    /**
      * 统计分类编号
      */
     private String classificationId;
@@ -269,11 +265,6 @@ public class CartGoods {
      */
     private String customerCode;
     /**
-     * 商品的SPU级 第三方编码
-     * 单规格和套餐商品，就是本身，多规格商品，是父商品
-     */
-    private String spuCustomerCode;
-    /**
      * 商品起售份数
      * 无起售份数默认值1
      */

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2841,7 +2841,6 @@ public class OrderAdapter {
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
-        createOrderProductDemoDto.setSpuCustomerCode(cartGoodsDetailDto.getSpuCustomerCode());
         createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
         createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
@@ -2862,10 +2861,6 @@ public class OrderAdapter {
         createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
         createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
         createOrderProductDemoDto.setScore(cartGoodsDetailDto.getScore());
-        // 商品所在的菜单分类信息
-        createOrderProductDemoDto.setThirdCategoryId(cartGoodsDetailDto.getCustomerCategoryCode());
-        createOrderProductDemoDto.setCategoryId(cartGoodsDetailDto.getNodeId());
-        createOrderProductDemoDto.setCategoryName(cartGoodsDetailDto.getCategoryName());
         createOrderProductDemoDto.setExtInfo(cartGoodsDetailDto.getExtInfo());
         return createOrderProductDemoDto;
     }

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

@@ -133,11 +133,6 @@ public class ShoppingCartGoodsDto {
         private String spuId;
 
         /**
-         * 多规格对应的父级商品的三方编号
-         */
-        private String spuCustomerCode;
-
-        /**
          * 原有商品类型
          *
          * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
@@ -198,10 +193,6 @@ public class ShoppingCartGoodsDto {
          */
         private String nodeId;
         /**
-         * 第三方的分类编码 三方订单使用
-         */
-        private String customerCategoryCode;
-        /**
          * 1.6.0 版本增加 分类名
          */
         private String categoryName;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -262,7 +262,8 @@ public class OrderServiceImpl implements Orderservice {
     private OrderQueueService orderQueueService;
     @Autowired
     private PayServiceImpl payServiceImpl;
-
+    @Autowired
+    private ComPayClient comPayClient;
     @Autowired
     private MicroOpenplatformClient microOpenplatformClient;
 
@@ -399,6 +400,38 @@ public class OrderServiceImpl implements Orderservice {
         }
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
 //        couponActivityService.callbackNotify(orderBean);
+
+        try {
+            //美团POS需求，混合支付（现金+储值卡）时，储值卡的交易流水号在预支付时是没有的，导致订单里没有储值卡的流水号，这里查一下支付信息，将储值卡的流水号信息更新到订单信息里
+            List<OrderPayItemResp> payItem = orderBean.getOrderPayItem();
+            if (CollectionUtils.isNotEmpty(payItem) && payItem.size() > 1) {
+                MultiQueryRequest queryPay = new MultiQueryRequest();
+                queryPay.setPartnerId(Integer.valueOf(partnerId));
+                queryPay.setStoreId(storeId);
+                queryPay.setOutOrderNo(orderBean.getOid());
+                MultiQueryRespDto payResponse = comPayClient.paymentApplicationQuery(queryPay, Integer.valueOf(partnerId));
+                if (null != payResponse && null != payResponse.getData() && CollectionUtils.isNotEmpty(payResponse.getData().getQueryList())) {
+                    List<MultiPaymentRespDto> payList = payResponse.getData().getQueryList();
+                    // 和订单里的匹配
+                    payList.forEach(pay -> {
+                        payItem.forEach(item -> {
+                            if (item.getTransId().equals(pay.getTransId())) {
+                                item.setFmTradeNo(pay.getFmTradeNo());
+                                item.setOutOrderNo(pay.getOutOrderNo());
+                            }
+                        });
+                    });
+                    // 更新订单信息
+                    OrderEditRequest editReq = new OrderEditRequest(orderBean.getOid(), orderBean.getExtInfo());
+                    editReq.setPayChannel(PayChannelType.COMB.getEbcode());
+                    editReq.setPayChannelName(PayChannelType.COMB.getName());
+                    editReq.setPayChannelType(PayChannelType.COMB.getIndex());
+                    editReq.setOrderPayItem(payItem);
+                    orderCenterSdkService.orderEdit(editReq);
+                }
+            }
+        } catch (Exception ignored) {} //这个异常catch住，不影响业务流程
+
         String takeCode;
         String daySeq;
         PayAccessResponse payAccessResponse;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java

@@ -117,7 +117,7 @@ public class OrderItemCreateReq {
     /**
      * 第三方商品分类
      */
-    private String thirdCategoryCode;
+    private String thirdCategoryId;
     //商品分类ID
     private String categoryId;
 

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

@@ -131,12 +131,10 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());
         cartGoodsDetailDto.setNodeId(cartGoods.getNodeId());
         cartGoodsDetailDto.setCategoryName(cartGoods.getCategoryName());
-        cartGoodsDetailDto.setCustomerCategoryCode(cartGoods.getCustomerCategoryCode());
         cartGoodsDetailDto.setCouponCode(cartGoods.getCouponCode());
         cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
         cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
-        cartGoodsDetailDto.setSpuCustomerCode(cartGoods.getSpuCustomerCode());
         cartGoodsDetailDto.setWeight(cartGoods.getWeight());
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());
         cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());
@@ -481,8 +479,6 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setExtra(addShoppingCartGoodsRequestVo.getExtra());
         cartGoods.setNodeId(addShoppingCartGoodsRequestVo.getNodeId());
         cartGoods.setCategoryName(addShoppingCartGoodsRequestVo.getCategoryName());
-        cartGoods.setCustomerCategoryCode(addShoppingCartGoodsRequestVo.getCustomerCategoryCode());
-        cartGoods.setSpuCustomerCode(addShoppingCartGoodsRequestVo.getSpuCustomerCode());
         List<CartGoods.ComboxGoods> productComboList = new ArrayList<>();
         List<CartGoods.ComboxGoods> productGroupList = new ArrayList<>();
         List<CartGoods.MaterialGoods> materialGoodsList = new ArrayList<>();

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

@@ -178,10 +178,6 @@ public class ShoppingCartGoodsDto {
          */
         private String spuId;
         /**
-         * 多规格对应的父级商品的三方编号
-         */
-        private String spuCustomerCode;
-        /**
          * spuId  如果是单品 skuId=spuId
          */
         private String skuId;
@@ -268,10 +264,6 @@ public class ShoppingCartGoodsDto {
          * 1.6.0 版本增加 分类名
          */
         private String categoryName;
-        /**
-         * 第三方的分类编码 三方订单使用
-         */
-        private String customerCategoryCode;
 
         /**
          * 套餐--父级商品Id

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

@@ -14,7 +14,6 @@ package cn.freemud.entities.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -63,17 +62,6 @@ public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
      */
     private String categoryName;
     /**
-     * 第三方的分类编码
-     */
-    @ApiModelProperty(value = "第三方的分类编码")
-    private String customerCategoryCode;
-    /**
-     * 商品spu级的三方编码
-     * 单规格值商品本身，多规格为具体规格商品对应的spu级别的商品，套餐为套餐本身
-     */
-    @ApiModelProperty(value = "商品spu级的三方编码")
-    private String spuCustomerCode;
-    /**
      * 套餐固定商品
      */
     private List<ComboxGoodsRequestVo> productComboList;

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

@@ -244,10 +244,6 @@ public class CartGoods {
      * 1.6.0 版本增加 分类名
      */
     private String categoryName;
-    /**
-     * 第三方的分类编码 第三方使用
-     */
-    private String customerCategoryCode;
 
     /**
      * 统计分类编号
@@ -301,11 +297,6 @@ public class CartGoods {
      */
     private String customerCode;
     /**
-     * 商品的SPU级 第三方编码
-     * 单规格和套餐商品，就是本身，多规格商品，是父商品
-     */
-    private String spuCustomerCode;
-    /**
      * 商品起售份数
      * 无起售份数默认值1
      */

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

@@ -430,12 +430,10 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());
         cartGoodsDetailDto.setNodeId(cartGoods.getNodeId());
         cartGoodsDetailDto.setCategoryName(cartGoods.getCategoryName());
-        cartGoodsDetailDto.setCustomerCategoryCode(cartGoods.getCustomerCategoryCode());
         cartGoodsDetailDto.setCouponCode(cartGoods.getCouponCode());
         cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
         cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
-        cartGoodsDetailDto.setSpuCustomerCode(cartGoods.getSpuCustomerCode());
         cartGoodsDetailDto.setWeight(cartGoods.getWeight());
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());
         cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());