美团pos需求去掉三方id保存的逻辑

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

@@ -2825,7 +2825,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());

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

@@ -27,8 +27,7 @@ import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.SendMessageRequest;
 import cn.freemud.entities.dto.openplatform.QueryInvoiceConfigRequest;
 import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
-import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
+import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.GroupDetail;
 import cn.freemud.entities.dto.product.ProductAttributeGroup;
@@ -256,7 +255,8 @@ public class OrderServiceImpl implements Orderservice {
     private OrderQueueService orderQueueService;
     @Autowired
     private PayServiceImpl payServiceImpl;
-
+    @Autowired
+    private ComPayClient comPayClient;
     @Autowired
     private MicroOpenplatformClient microOpenplatformClient;
 
@@ -393,6 +393,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;

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

@@ -832,12 +832,11 @@ public class PayServiceImpl {
         if (null != orderPayItemList && orderPayItemList.size() > 0) {
             Integer partnerId = Integer.valueOf(orderBean.getCompanyId());
             MultiQueryRequest request = new MultiQueryRequest();
-            request.setEnable_platform_data_query(false);
             request.setPartnerId(partnerId);
             request.setStoreId(orderBean.getShopId());
             request.setOutOrderNo(orderBean.getOid());
             //查询聚合支付结果
-            MultiQueryRespDto<MultiQueryRespDto.Data> response = comPayClient.paymentApplicationQuery(request, partnerId);
+            MultiQueryRespDto response = comPayClient.paymentApplicationQuery(request, partnerId);
             if (response != null && response.getData() != null && Objects.equals(response.getCode(), MULITI_RESPONSE)) {
                 List<MultiPaymentRespDto> multiPaymentRespDtoArrayList = response.getData().getQueryList();
                 if (null != multiPaymentRespDtoArrayList && multiPaymentRespDtoArrayList.size() > 0) {

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/calculate/Discount.java

@@ -65,4 +65,9 @@ public class Discount {
      */
     private String cartGoodsUid;
 
+    /**
+     * 活动优先级  值越大越先参与计算
+     */
+    private Integer priority;
+
 }

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/product/ProductBean.java

-package cn.freemud.entities.product;
-
-import cn.freemud.entities.dto.BindingCouponTypeDto;
-import cn.freemud.entities.dto.GetMenuResponseDto;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author Clover.z
- * @Date 2021/10/29
- * @Desc
- */
-@Data
-public class ProductBean {
-
-    private String barcode;
-    private String brandId;
-    private String brandName;
-    private String category;
-    private String categoryName;
-    private String companyId;
-
-    /**
-     * 加料最大限购
-     */
-    private Integer maxNum;
-
-    /**
-     * 加料最小限购
-     */
-    private Integer minNum;
-    private String customerCode;
-    /**
-     * 最终价格 单位分
-     */
-    private Long finalPrice;
-    /**
-     * 是否是SKU商品  1是0否
-     */
-    private Integer isSkuProduct;
-    private String name;
-    private String foreignName;
-    /**
-     * 原始价格 单位分
-     */
-    private Long originalPrice;
-    /**
-     * 包装费 单位分
-     */
-    private Long packPrice;
-
-    private String picture;
-    private String pid;
-    private Integer pknumber;
-    private String productionLocation;
-    private String remark;
-    private Integer saleCount;
-    private String sellTimeName;
-    private Integer sequence;
-    private String sourceChannel;
-    private String specification;
-    private Integer status;
-    private Integer stock;
-    private Integer stockLimit;
-    /**
-     * type=10 多规格  type=1 单规格
-     */
-    private int type;
-    /**
-     * 是否是称重商品 1、表示为称重
-     */
-    private Integer weightType;
-    /**
-     * 重量,最多四位小数，单位kg
-     */
-    private Double weight;
-    private String unit;
-    private int updateStatus;
-    private boolean valid;
-    private int version;
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.ProductLabelNameListBean> labelNames;
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.ProductAttributeGroupListBean> productAttributeGroupList;
-    private List<?> productGroupList;
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.ProductPictureListBean> productPictureList;
-    private List<?> productSpecification;
-    private List<?> sellTimeList;
-    private List<?> specificationList;
-    //SKU
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.SkuProductBean> skuList;
-    //规格信息
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.SpecificationGroupBean> specificationGroupList;
-    //Sku 规格 如果 当前是sku 则有值
-    private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.SkuProductBean.SkuSpecValue> skuSpecValues;
-
-    /**
-     * 虚拟商品 绑定的券信息
-     */
-    private List<BindingCouponTypeDto> productBindingCouponTypes;
-
-    @NoArgsConstructor
-    @Data
-    public static class SkuProductBean {
-        private Long finalPrice;
-        private Long originalPrice;
-        private String productName;
-        private String foreignProductName;
-        private Integer productType;
-        private Integer sequence;
-        private String skuCode;
-        private String skuId;
-
-        private Integer status;
-        //以下两个字段 1.5.4新加
-        private Integer stockLimit;
-        private Integer stockQty;
-        //sku商品包装费 1.5.4新加
-        private Long packPrice ;
-        private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.SkuProductBean.SkuSpecValue> skuSpecValues;
-
-        @NoArgsConstructor
-        @Data
-        public static class SkuSpecValue {
-            private String productId;
-            private Integer sequence;
-            private String specId;
-            private String specName;
-            private String foreignSpecName;
-            private String specValue;
-            private String foreignSpecValue;
-            private String specValueId;
-        }
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class SpecificationGroupBean {
-        private String partnerId;
-        private Integer sequence;
-        private String specId;
-        private String specName;
-        private String foreignSpecName;
-        private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.SpecificationGroupBean.SpecValueVo> specValueVos;
-
-        @NoArgsConstructor
-        @Data
-        public static class SpecValueVo {
-            private Integer sequence;
-            private String specId;
-            private String specValue;
-            private String foreignSpecValue;
-            private String specValueId;
-        }
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class ProductLabelNameListBean {
-        private String id;
-        private String name;
-        private String foreignName;
-        private String partnerId;
-        List<?> productList;
-        private String storeId;
-        private String type;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class ProductAttributeGroupListBean {
-        /**
-         * attributeName : 加料
-         * attributeType : 1
-         * attributeValues : [{"attributeValue":"","id":0,"price":0,"sequence":0,"status":0}]
-         */
-
-        /**
-         * 属性名称
-         */
-        private String attributeName;
-
-        private String foreignAttributeName;
-
-
-        /**
-         * 属性类型
-         */
-        private Integer attributeType;
-        /**
-         * 属性详细信息
-         */
-        private List<GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean.ProductAttributeGroupListBean.AttributeValueBean> attributeValues;
-
-        @NoArgsConstructor
-        @Data
-        public static class AttributeValueBean {
-            /**
-             * attributeValue :
-             * id : 0
-             * price : 0
-             * sequence : 0
-             * status : 0
-             */
-            /**
-             * 属性值
-             */
-            private String attributeId;
-
-            private String attributeValue;
-
-            private String foreignAttributeValue;
-            /**
-             * 属性ID
-             */
-            private Long id;
-            /**
-             *
-             */
-            private Long price;
-            private Integer sequence;
-            private Integer status;
-        }
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class ProductPictureListBean {
-        /**
-         * pictureId : 107901339444445753
-         * productId : 107901318808470072
-         * sequence : 0
-         * type : default
-         * url : http://ojcpa0rpt.bkt.clouddn.com/xianfengfruit_DishPool_default_30b5f0ca-399a-4be3-9063-12a3d2622a38_1513952518.jpg
-         */
-
-        private String pictureId;
-        private String productId;
-        private String sequence;
-        private String type;
-        private String url;
-    }
-
-}

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/ShoppingCartNewServiceImpl.java

@@ -23,6 +23,7 @@ import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.demo.controller.ShoppingCartDemoController;
 import cn.freemud.demo.entities.dto.goods.add.list.BaseListCartGoodsVO;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.activity.DiscountSharingDto;
@@ -2088,7 +2089,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 美团Pos需求，针对优惠信息进行排序
         List<ActivityDiscountsDto> discounts = shoppingCartGoodsDto.getActivityDiscountsDtos();
         discounts.forEach(discount -> {
-            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount rd : calculationDiscountResult.getDiscounts()) {
+            for (Discount rd : calculationDiscountResult.getDiscounts()) {
                 // 一定要先判断套餐，不清楚为什么套餐设置的活动是221-集点活动，不先判断的话，可能会匹配成集点的优先级了
                 if (discount.getActivityCode().equals("setMeal")) {
                     // 套餐优惠不是促销返回的，这里和促销新算价保持一直，优先级设置为0

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