Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'qa' of…

Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.0.RELEASE</version>
+    <version>1.1.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -3,4 +3,6 @@
 | --------------| ------------ | ------------- | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 6.4.10.RELEASE| 骑手小费  | 张明警 | 2019-12-26  |
-| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
+| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
+| 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
\ No newline at end of file

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

@@ -2481,6 +2481,13 @@ public class OrderSdkAdapter {
         createOrderProductRequest.setUnit(productBean.getUnit());
         createOrderProductRequest.setId(productBean.getId());
         createOrderProductRequest.setProductType(productBean.getProductType());
+        OrderProductAddInfoDto extInfo = JSONObject.parseObject(productBean.getExtInfo(), OrderProductAddInfoDto.class);
+        if(extInfo != null) {
+            createOrderProductRequest.setIsFixedProduct(extInfo.getIsFixedProduct());
+            createOrderProductRequest.setThirdProductSpecId(extInfo.getThirdProductSpecId());
+            createOrderProductRequest.setThirdProductPropertyId(extInfo.getThirdProductPropertyId());
+        }
+
         if (productBean.getWeight() != null) {
             createOrderProductRequest.setWeight(productBean.getWeight().doubleValue());
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -73,4 +73,9 @@ public class OrderExtInfoDTO {
     private String memberLevel;
 
     private boolean paidMember;
+
+    /**
+     * 异常补退使用
+     */
+    private String sessionKey;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -992,11 +992,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 updateOrderProductInfoRequest.getOrderItemList().forEach( t -> {
                     CreateOrderProductRequest createOrderProductRequest = createOrderProductRequestMap.get(t.getId());
                     if(createOrderProductRequest != null) {
-                        if(!isDeleted) {
-                            createOrderProductRequest.setWeight(t.getWeight());
+                        createOrderProductRequest.setIsDeleted(isDeleted);
+                        if(isDeleted) {
+                            if(CollectionUtils.isNotEmpty(createOrderProductRequest.getComboProduct())) {
+                                createOrderProductRequest.getComboProduct().forEach(ct -> {
+                                    ct.setIsDeleted(true);
+                                });
+                            }
                             deletedOrderProductList.add(createOrderProductRequest);
+                        } else {
+                            if(t.getWeight() != null && t.getWeight() > 0D) {
+                                createOrderProductRequest.setWeight(t.getWeight());
+                            }
+                            if(t.getNumber() != null && t.getNumber() > 0) {
+                                createOrderProductRequest.setNumber(t.getNumber());
+                            }
                         }
-                        createOrderProductRequest.setIsDeleted(isDeleted);
                     }
                 });
             }

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.4.1-SNAPSHOT</version>
+            <version>2.7.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

 package com.freemud.sdk.api.assortment.shoppingcart.adapter;
 
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductStatus;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductType;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateSkuProductType;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoodsStates;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
@@ -43,6 +44,64 @@ public class ShoppingCartAdapter {
         return request;
     }
 
+    public ValidateShopProductRequest getValidateShopProductRequest(CheckCartRequest checkCartRequest){
+        ValidateShopProductRequest validateShopProductRequest = new ValidateShopProductRequest();
+        validateShopProductRequest.setChannel(OrderChannelType.SAAS.getCode());
+        validateShopProductRequest.setPartnerId(checkCartRequest.getPartnerId());
+        validateShopProductRequest.setStoreId(checkCartRequest.getStoreId());
+        validateShopProductRequest.setProductTypeList(new ArrayList<>());
+        for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
+            // 过滤非商品券商品
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)){
+                continue;
+            }
+            ValidateShopProductType productType = new ValidateShopProductType();
+            productType.setSpuId(cartGoods.getSpuId());
+            productType.setSkuId(ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(),cartGoods.getGoodsType())? cartGoods.getSkuId():cartGoods.getSpuId());
+            productType.setPrice(cartGoods.getOriginalPrice()==null?0:cartGoods.getOriginalPrice().intValue());
+            productType.setValidatePrice(productType.getPrice()==0?0:1);
+            productType.setValidateAttribute(1);
+            productType.setValidateStatuses(Arrays.asList(2));
+            productType.setUuid(cartGoods.getCartGoodsUid());
+            //属性
+            productType.setAttributeList(getAttributes(cartGoods.getExtra()));
+            //可选搭配&固定搭配
+            productType.setComboProductTypeList(getValidateSkuProductType(cartGoods.getProductComboList()));
+            productType.setProductGroupTypeList(getValidateSkuProductType(cartGoods.getProductGroupList()));
+            validateShopProductRequest.getProductTypeList().add(productType);
+        }
+        return validateShopProductRequest;
+    }
+
+    public List<ProductAttributeValueType> getAttributes( List<CartGoods.CartGoodsExtra> extra){
+        List<ProductAttributeValueType> attributeValueTypes=new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(extra)){
+            for (CartGoods.CartGoodsExtra cartGoodsExtra :extra) {
+                ProductAttributeValueType productAttributeValueType = new ProductAttributeValueType();
+                productAttributeValueType.setAttributeId(cartGoodsExtra.getAttributeId());
+                productAttributeValueType.setAttributeValue(cartGoodsExtra.getAttributeName());
+                attributeValueTypes.add(productAttributeValueType);
+            }
+        }
+        return attributeValueTypes;
+    }
+
+    public List<ValidateSkuProductType> getValidateSkuProductType(List<CartGoods.ComboxGoods> productComboList){
+        List<ValidateSkuProductType> result=new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(productComboList)){
+            for (CartGoods.ComboxGoods comboxGoods :productComboList) {
+                ValidateSkuProductType validateSkuProductType = new ValidateSkuProductType();
+                validateSkuProductType.setProductId(comboxGoods.getGoodsId());
+                validateSkuProductType.setPrice(comboxGoods.getOriginalPrice()==null?0:comboxGoods.getOriginalPrice().intValue());
+                validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice()==null?0:comboxGoods.getFinalPrice().intValue());
+                validateSkuProductType.setQty(comboxGoods.getQty());
+                validateSkuProductType.setAttributeList(getAttributes(comboxGoods.getExtra()));
+                result.add(validateSkuProductType);
+            }
+        }
+        return result;
+    }
+
     public GetProductInfoRequest convertGetProductInfoRequest(CheckCartRequest checkCartRequest) {
         //获取goodsId集合，包含套餐内的固定商品和可选商品
         List<List<CartGoods.ComboxGoods>> productGroupLists = checkCartRequest.getCartGoodsList().stream().filter(goods -> CollectionUtils.isNotEmpty(goods.getProductGroupList())).map(CartGoods::getProductGroupList).collect(Collectors.toList());
@@ -112,8 +171,6 @@ public class ShoppingCartAdapter {
         String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
         cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
                 skuSpecName + "/" + attributeName : skuSpecName + attributeName);
-
-
         cartGoods.setPic(StringUtils.isBlank(productBean.getPicture()) ? spuProduct.getPicture() : productBean.getPicture());
         cartGoods.setPackPrice(productBean.getPackPrice());
         cartGoods.setStockLimit(ObjectUtils.equals(1, productBean.getStockLimit()));
@@ -187,6 +244,72 @@ public class ShoppingCartAdapter {
         cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(productBean.getWeightType()));
     }
 
+    /**
+     * 更新当前购物车商品行信息
+     *
+     * @param cartGoods       当前购物车商品行
+     * @param productBeans    购物车中所有的productId对应的商品详情
+     */
+    public void updateCartGoodsInfoNew(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
+        Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
+        if (!firstProduct.isPresent()) {
+            return;
+        }
+        ProductBeanDTO spuProduct = firstProduct.get();
+        //是否是sku商品
+        boolean isSkuProduct=ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
+        // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
+        boolean isSetMealProduct = ObjectUtils.equals(ProductType.SetMeal.getCode(), spuProduct.getType()) || ObjectUtils.equals(ProductType.IncreasedPackage.getCode(), spuProduct.getType());
+        ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
+
+        Map<String, String> attributes = getAttributesNew(cartGoods.getExtra());
+        cartGoods.setName(spuProduct.getName());
+        cartGoods.setSpuName(spuProduct.getName());
+        cartGoods.setSkuName(isSkuProduct?skuProduct.getProductName():spuProduct.getName());
+        cartGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
+        cartGoods.setPic(spuProduct.getPicture());
+        cartGoods.setPackPrice(isSkuProduct?skuProduct.getPackPrice(): spuProduct.getPackPrice());
+        cartGoods.setStockLimit(isSkuProduct? ObjectUtils.equals(1, skuProduct.getStockLimit()):ObjectUtils.equals(1, spuProduct.getStockLimit()));
+        cartGoods.setCustomerCode(isSkuProduct?skuProduct.getCustomerCode(): spuProduct.getCustomerCode());
+
+        String skuSpecName = "";
+        if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {
+            List<String> skuSpecValus = skuProduct.getSkuSpecValues().stream().map(p -> p.getSpecValue()).collect(Collectors.toList());
+            skuSpecName = StringUtils.join(skuSpecValus, "/");
+        }
+        String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
+        cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
+                skuSpecName + "/" + attributeName : skuSpecName + attributeName);
+
+        if (isSetMealProduct) {
+            if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
+                for (CartGoods.ComboxGoods productCombo : cartGoods.getProductComboList()) {
+                    updateComboxGoodsInfoNew(productCombo,spuProduct, true);
+                }
+            }
+            if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
+                for (CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
+                    updateComboxGoodsInfoNew(productGroup,spuProduct, false);
+                }
+            }
+        }
+        //更新当前商品行价格
+        Long newOrigOriginalPrice = 0L;
+        if (isSetMealProduct) {
+            newOrigOriginalPrice+=cartGoods.getProductComboList().stream().mapToLong(t->t.getOriginalAmount()).sum();
+            newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+        } else {
+            newOrigOriginalPrice =isSkuProduct?skuProduct.getFinalPrice(): spuProduct.getFinalPrice();
+        }
+        cartGoods.setOriginalPrice(newOrigOriginalPrice);
+        cartGoods.setOriginalAmount(newOrigOriginalPrice*cartGoods.getQty());
+        cartGoods.setAmount(newOrigOriginalPrice*cartGoods.getQty());
+        //咨询商品服务，套餐售价取originalPrice
+        cartGoods.setFinalPrice(isSetMealProduct?spuProduct.getOriginalPrice(): isSkuProduct? skuProduct.getFinalPrice():spuProduct.getFinalPrice());
+        cartGoods.setUnit(spuProduct.getUnit());
+        cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));
+    }
+
     private boolean updateComboxGoodsInfo(CartGoods cartGoods, CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, List<ProductBeanDTO> productBeans, CartGoodsStates cartGoodsStates, List<String> invalidGoodsIdList) {
         // 可选商品详情
         Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), comboxGoods.getGoodsId())).findFirst();
@@ -233,6 +356,44 @@ public class ShoppingCartAdapter {
         return true;
     }
 
+    /**
+     *  更新套餐固定商品、可选商品信息
+     *
+     * @param comboxGoods 固定商品或可选商品
+     * @param parentProductBean 套餐服商品
+     * @param isComboxGoods 是否是固定商品
+     * @return
+     */
+    private void updateComboxGoodsInfoNew(CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, boolean isComboxGoods) {
+
+        ProductBeanDTO.ProductComboType productComboType = new ProductBeanDTO.ProductComboType();
+        ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType=new  ProductBeanDTO.ProductGroupType.GroupDetailType();
+        if (isComboxGoods){
+            productComboType=   parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductBeanDTO.ProductComboType());
+        }else {
+            Map<String, ProductBeanDTO.ProductGroupType.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());
+        }
+
+        // 若是固定商品则取商品详情的FinalPrice，若是可选商品则取MarkUpPrice
+        Long finalPrice =isComboxGoods? productComboType.getFinalPrice().longValue():groupDetailType.getMarkUpPrice().longValue();
+        // 设置商品详情
+        Map<String, String> attributes = getAttributesNew(comboxGoods.getExtra());
+        comboxGoods.setName(isComboxGoods?productComboType.getProductName():groupDetailType.getProductName());
+        comboxGoods.setSpuName(comboxGoods.getName());
+        comboxGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
+        comboxGoods.setSubName(attributes.get(ATTRIBUTENAME));
+        comboxGoods.setPic(isComboxGoods?productComboType.getPicture():groupDetailType.getPicture());
+        comboxGoods.setOriginalPrice(isComboxGoods?productComboType.getFinalPrice().longValue():groupDetailType.getProductFinalPrice().longValue());
+        comboxGoods.setOriginalAmount(comboxGoods.getOriginalPrice()*comboxGoods.getQty());
+        comboxGoods.setAmount(finalPrice*comboxGoods.getQty());
+        comboxGoods.setCustomerCode(isComboxGoods?productComboType.getCustomerCode():groupDetailType.getCustomerCode());
+        comboxGoods.setFinalPrice(finalPrice);
+        comboxGoods.setWeightType(isComboxGoods? CommonsConstant.WEIGHT_PRODUCT.equals(productComboType.getWeightType()):CommonsConstant.WEIGHT_PRODUCT.equals(groupDetailType.getWeightType()));
+        comboxGoods.setUnit(isComboxGoods?productComboType.getUnit():groupDetailType.getUnit());
+    }
+
     private Map<String, String> getAttributes(CartGoods cartGoods, List<CartGoods.CartGoodsExtra> extra, List<ProductBeanDTO.ProductAttributeGroupListBean> attributeGroupListBeanList, List<String> invalidGoodsIdList) {
         if (CollectionUtils.isEmpty(extra) && CollectionUtils.isNotEmpty(attributeGroupListBeanList)) {
             invalidGoodsIdList.add(cartGoods.getCartGoodsUid());
@@ -269,6 +430,18 @@ public class ShoppingCartAdapter {
         return result;
     }
 
+    private Map<String, String> getAttributesNew(List<CartGoods.CartGoodsExtra> extra) {
+        if (CollectionUtils.isEmpty(extra)) {
+            return new HashMap<>();
+        }
+        List<String> attributeIds = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeId).collect(Collectors.toList());
+        List<String> attributeNames = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeName).collect(Collectors.toList());
+        Map<String, String> result = new HashMap<>();
+        result.put(ATTRIBUTEID, StringUtils.join(attributeIds, "/"));
+        result.put(ATTRIBUTENAME, StringUtils.join(attributeNames, "/"));
+        return result;
+    }
+
     private boolean checkComboProductChange(List<CartGoods.ComboxGoods> comboxGoods, ProductBeanDTO productBean, CartGoods cartGoods, List<String> invalidGoodsIdList) {
 
         for (ProductBeanDTO.ProductComboType product : productBean.getProductComboList()) {

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -14,11 +14,17 @@
 package com.freemud.sdk.api.assortment.shoppingcart.constant;
 
 public class ShoppingCartConstant {
+    public final static String SHOPPING_CART_INVALIAD_GOODS="因商家变更了商品，导致选购失败，请刷新门店后重新尝试选购商品";
+    public final static String SHOPPING_CART_EMPTY_GOODS_LIST="因商品变更或其他原因，导致加购失效，无法结算，请重新尝试选购商品";
 
     public final static String SHOPPING_CART_INVALID_GOODS_EXIST = "有商品不在售卖状态，请重新提交结算";
 
     public final static String SHOPPING_CART_ACTIVITY_CHANGE = "商品价格有变动，将按照最新价格计算哦";
 
+    public final static String SHOPPING_CART_GOODS_CHANGE="因商家变更了商品，导致选购失效，请刷新门店后重新尝试选购商品";
+
+    public final static String SHOPPING_CART_GOODS_INVALID="因商品变更或其他原因，导致架构失效，无法结算，请重新尝试选购商品";
+
 
     public final static String HAS_OTHER_ACTIVITY_WHEN_ADD_GOODS_COUPON = "该商品券与其他活动不同享，购物车中已优惠的商品将恢复原价";
     public final static String HAS_GOODS_COUPON_WHEN_ADD_SPECIAL_GOODS = "已选商品券，与其他优惠商品不同享，商品将恢复原价";

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

@@ -66,7 +66,7 @@ public class ShoppingCartGoodsResponseVo {
     /**
      * 购物车中商品价格或有效性是否发生变化
      */
-    private Boolean changed;
+    private Boolean changed=false;
 
     /**
      * 可用优惠券列表

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/GetProductInfoRequest.java

@@ -27,4 +27,6 @@ public class GetProductInfoRequest {
 
     String trackingNo;
 
+    String businessType;
+
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -18,7 +18,13 @@ import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.domain.ProductInfosDTO;
 import com.freemud.application.sdk.api.productcenter.request.menu.GetMenuCategoryByIdsRequest;
 import com.freemud.application.sdk.api.productcenter.request.product.GetProductRequest;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
+import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateSkuProductType;
 import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryByIdsResponse;
+import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
+import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResult;
 import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.sdk.api.assortment.shoppingcart.adapter.ShoppingCartAdapter;
@@ -106,7 +112,7 @@ public interface ShoppingCartBaseService {
             getProductInfoDto.setShopId(getProductInfoRequest.getStoreId());
             getProductInfoDto.setProductInfoType(2);
             getProductInfoDto.setProductIds(goodsIds);
-            getProductInfoDto.setChannel(OrderChannelType.SAAS.getCode());
+            getProductInfoDto.setChannel(getProductInfoRequest.getBusinessType());
             ProductService productService = SDKCommonBaseContextWare.getBean(ProductService.class);
             com.freemud.application.sdk.api.base.BaseResponse<ProductInfosDTO> productInfosDTOBaseResponse = productService.listProductInfoByIdList(getProductInfoDto, LogThreadLocal.getTrackingNo());
             if (!Objects.equals(ResponseResultEnum.SUCCESS.getCode(), productInfosDTOBaseResponse.getCode()) || productInfosDTOBaseResponse.getData() == null) {
@@ -165,6 +171,64 @@ public interface ShoppingCartBaseService {
         }
     }
 
+    default BaseResponse<CheckCartRequest> checkAllCartGoodsNew(CheckCartRequest checkCartRequest) {
+        ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
+        ProductService productService = SDKCommonBaseContextWare.getBean(ProductService.class);
+        try {
+            ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
+            com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
+            if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
+            }
+            ValiadShopProductResponse valiadResult = valiadResponse.getData();
+            //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
+            if (CollectionUtils.isNotEmpty(valiadResult.getFailureList())){
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
+                for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
+                    if (valiadResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
+                        cartGoods.setCartGoodsUid(null);
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                    }
+                }
+                checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
+            }
+
+            List<ProductBeanDTO> productList = valiadResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+            CartGoodsStates cartGoodsStates = new CartGoodsStates();
+            //更新购物车详细信息
+            if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList()) || CollectionUtils.isEmpty(productList)){
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
+            }
+            for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
+                // 当goodsId为空或商品是商品券时直接跳过
+                if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())) {
+                    continue;
+                }
+                shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
+            }
+            //校验商品券是否有当前点餐方式
+            cartGoodsStates = updateSpqCartGoodsInfo(checkCartRequest.getCartGoodsList(), checkCartRequest.getOrderWay(), checkCartRequest.getPartnerId(), checkCartRequest.getTrackingNo(), cartGoodsStates);
+
+            // 点餐方式改变商品券发生变动
+            if (cartGoodsStates != null && cartGoodsStates.isOrderWayFlag()) {
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.ORDER_WAY_CHANGE);
+            }
+            return CartResponseUtil.success(checkCartRequest);
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
+            checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+            return CartResponseUtil.error(e.getMessage(),checkCartRequest);
+        }
+    }
+
+
+
     /**
      * 更新购物车详细信息
      * 并check购物车中商品是否价格变更、是否非法（例如商品下架）
@@ -285,8 +349,7 @@ public interface ShoppingCartBaseService {
             }
             ProductBeanDTO productBean;
             // 判断商品是否合法（商品是否存在、商品是否处于上架状态）
-            if (((productBean = productBeanMap.get(cartGoods.getGoodsId())) != null) && (productBean.isValid())
-                    && (StoreItemStatus.PUT_ON_SALE.getCode().equals(productBean.getStatus()))) {
+            if (((productBean = productBeanMap.get(cartGoods.getGoodsId())) != null) && (StoreItemStatus.PUT_ON_SALE.getCode().equals(productBean.getStatus()))) {
                 ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
                 shoppingCartAdapter.updateCartGoodsInfo(cartGoods, productBeans, cartGoodsStates, invalidGoodsIdList);
             } else {

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java

@@ -116,7 +116,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
                     .filter(k -> StringUtils.isNotEmpty(k.getCartGoodsUid()))
                     .collect(Collectors.toMap(CartGoods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
             operations.putAll(cartGoodsMap);
-            return this.getCartGoodsList(cartParamDto, trackingNo);
+            return CartResponseUtil.success();
         } catch (Exception e) {
             ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
             return null;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/CartResponseUtil.java

@@ -29,4 +29,7 @@ public class CartResponseUtil {
     public static <T> BaseResponse<T> error(String message) {
         return new BaseResponse<>(Version.VERSION_1, CartResponseConstant.FAIL.getCode(), message);
     }
+    public static <T> BaseResponse<T> error(String message,T t) {
+        return new BaseResponse<>(CartResponseConstant.FAIL.getCode(), message, Version.VERSION_1, t);
+    }
 }

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -91,6 +91,10 @@ public class OrderCallBackMQService {
             ErrorLog.infoConvertJson(context.getEnvironment().getProperty("spring.application.name"), LogThreadLocal.getTrackingNo(), this.getClass(), "parseObjectOrderInfoReqsError", ex);
             return null;
         }
+        // 未支付订单不通知开放平台
+        if (ObjectUtils.equals(1, orderInfoReqs.getPayState()) || ObjectUtils.equals(NewOrderStatus.PENDING_PAYMENT.getIndex(), orderInfoReqs.getOrderState())) {
+            return null;
+        }
         return orderInfoReqs;
     }
 }

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.2.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>
@@ -109,7 +109,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>3.5.RELEASE</version>
+            <version>3.9.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -71,6 +71,15 @@ public class OrderController {
     }
 
     /**
+     * 扫脸支付下单
+     */
+    @ApiAnnotation(logMessage = "scanFaceCreateOrder")
+    @PostMapping("/scanFaceCreateOrder")
+    public BaseResponse scanFaceCreateOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
+        return orderservice.scanFaceCreateOrder(createOrderVo);
+    }
+
+    /**
      * 订单支付成功后通知
      */
     @ApiAnnotation(logMessage = "paySuccessCallback")

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 public class PayGitCheckAndJoinRequestDto {
     //门店编号
@@ -22,4 +24,6 @@ public class PayGitCheckAndJoinRequestDto {
 
     //点餐方式 1-到店取餐 2-外卖
     private Integer orderWay;
+
+    private List<String> skuIds;
 }

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

+package cn.freemud.entities.dto.order;
+
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CreateOrderOperateDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 18:00
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CreateOrderOperateDto {
+
+    //支付总金额（父子订单时包括购买会员卡订单金额）
+    private Long totalAmount;
+    //会员卡支付金额
+    private Integer cardAmount;
+    //父子订单父订单
+    private QueryOrdersResponse.DataBean.OrderBean fatherOrderBean;
+    //父子订单商品订单
+    private QueryOrdersResponse.DataBean.OrderBean productOrderBean;
+
+}

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

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayRequestDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:28
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class FacePayRequestDto {
+
+    private String ver;
+    private String body;
+    private String cardCode;
+    private String divideDetail;
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String businessDate;
+    private Long amount;
+    private Long clientCode;
+    private String code;
+    private Long undisAmount;
+//    private List<CodePayRequest.PayProduct> products;
+
+}

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

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayResponseDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:23
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class FacePayResponseDto {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String fmId;
+    private String payTransId;
+    private String payCode;
+    private String userId;
+    private String originalChannel;
+    private Integer merchantCoupon;
+    private Integer platformCoupon;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -13,8 +13,8 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -170,6 +170,14 @@ public class CreateOrderVo {
      */
     private String cardCode;
 
+    /**
+     * 扫脸支付使用
+     */
+    private String faceCode;
+
+    @ApiModelProperty(hidden = true)
+    private String sessionKey; // 存储sessionKey,异常补退使用
+
     @Data
     public static class PremiumExchangeActivity {
         @NotNull(message = "activityCode 不能为空")

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -22,6 +22,8 @@ public interface Orderservice {
      */
     BaseResponse createOrderNew(CreateOrderVo createOrderVo);
 
+    BaseResponse scanFaceCreateOrder(CreateOrderVo createOrderVo);
+
     /**
      * 支付成功后回调通知
      */

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

@@ -52,6 +52,7 @@ import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.promotion.response.ShoppingCartGoodsResponse;
 import com.freemud.sdk.api.assortment.promotion.service.ActivityCalculationDiscountService;
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -107,6 +108,8 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
+    private final String SESSION_KEY = "sessionKey";
+
     @Override
     public BaseResponse createReserveOrder(CreateOrderVo createOrderVo) {
         //查询用户缓存信息(用户信息，用户绑定桌号信息)
@@ -242,6 +245,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         }
         groupCreateOrderRequest.setProducts(orderProductRequests);
         groupCreateOrderRequest.setOperator(assortmentCustomerInfoVo.getNickName() == null ? "围餐": assortmentCustomerInfoVo.getNickName());
+        // 扩展字段添加sessionKey
+        if (StringUtils.isNotBlank(createOrderVo.getSessionKey())) {
+            groupCreateOrderRequest.setExtInfo(JSONObject.toJSONString(ImmutableMap.of(SESSION_KEY, createOrderVo.getSessionKey())));
+        }
         return orderCenterSdkService.createGroupOrder(groupCreateOrderRequest);
     }
 

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

@@ -45,6 +45,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        // 扩展字段中存储 sessionKey
+        createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
         if(IappIdType.WC_XCX.getCode().equals(assortmentCustomerInfoVo.getIappId())){  //i围餐
             BaseResponse baseResponse = null;
             CreateReserveOrderVo createReserveOrderVo = new CreateReserveOrderVo();
@@ -54,13 +56,13 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             createReserveOrderVo.setOrderUpdateVer(createOrderVo.getOrderUpdateVer());
             if(createOrderVo.getOperation() == null) throw new ServiceException(ResponseResult.ORDER_CREATE_OPERATION_ERROR);
             switch (createOrderVo.getOperation()){
-                case 2:
+                case 2:// 开台
                     baseResponse = encircleOrderService.createReserveOrder(createOrderVo);
                     break;
-                case 3:
+                case 3:// 下单
                     baseResponse = encircleOrderService.updateReserveOrder(createReserveOrderVo);
                     break;
-                case 4:
+                case 4:// 创建预支付订单
                     baseResponse = encircleOrderService.createPrepaymentOrder(createReserveOrderVo);
                     break;
                     default:

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

@@ -29,6 +29,9 @@ import cn.freemud.entities.dto.PayAccessResponse;
 import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
+import cn.freemud.entities.dto.order.CreateOrderOperateDto;
+import cn.freemud.entities.dto.order.FacePayRequestDto;
+import cn.freemud.entities.dto.order.FacePayResponseDto;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.ProductAttributeGroup;
 import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
@@ -82,7 +85,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig;
 import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
-import com.freemud.sdk.api.assortment.message.entity.TemplateKeyword;
+import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsgDataValue;
 import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
@@ -203,6 +206,8 @@ public class OrderServiceImpl implements Orderservice {
     private ActivityApplicationClient activityApplicationClient;
     @Autowired
     private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
+    @Autowired
+    private PaymentNewClient paymentNewClient;
 
 
 
@@ -271,6 +276,27 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     /**
+     * 扫脸支付下单
+     */
+    @Override
+    public BaseResponse scanFaceCreateOrder(CreateOrderVo createOrderVo) {
+        String trackingNo = LogThreadLocal.getTrackingNo();
+        // 查询用户信息、校验svc卡,余额购物车校验
+        UserLoginInfoDto userLoginInfoDto = checkOrder.checkOrderByMember(createOrderVo, trackingNo);
+        // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
+        StoreResponse.BizVO storeResponseDto = checkOrder.checkOrderByStore(createOrderVo, trackingNo);
+        // 查询购物车（内部校验券点餐方式，券是否可用） 校验当前订单类型的下单参数
+        ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
+        // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
+        Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto,shoppingCartGoodsDto.getTotalAmount(), trackingNo);
+        //1.5.4版本，商品库存校验与扣库存
+        //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
+        OrderExtInfoDTO extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        //下单并支付
+        return this.createOrderAndPay(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto, extInfo);
+    }
+
+    /**
      * 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
      *
      * @param partnerId
@@ -549,7 +575,7 @@ public class OrderServiceImpl implements Orderservice {
         JSONObject jsonObject = JSONObject.parseObject(res);
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
-            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code)) {
+            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
                 //  新版支付成功的情况下code为100
                 return newSendPaySuccessNoticeMessage();
             } else {
@@ -806,6 +832,9 @@ public class OrderServiceImpl implements Orderservice {
         payGitRequestDto.setOid(queryOrderResponseVo.getOid());
         payGitRequestDto.setPayAmount(queryOrderResponseVo.getAmount());
         payGitRequestDto.setPayType(1);//1-微信,2-储值卡
+        if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts())){
+            payGitRequestDto.setSkuIds(queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList()));
+        }
         if (OrderType.COLLECT_GOODS.getCode().intValue() == queryOrderResponseVo.getOrderType() || OrderType.EAT_IN.getCode().intValue() == queryOrderResponseVo.getOrderType()) {
             payGitRequestDto.setOrderWay(1);
         } else {
@@ -1935,6 +1964,8 @@ public class OrderServiceImpl implements Orderservice {
         if (memberCard != null && memberCard.getRuleId() != null) {
             orderExtInfoDto.setRuleId(memberCard.getRuleId());
         }
+        // 扩展字段中存储 sessionKey
+        orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         return orderExtInfoDto;
     }
 
@@ -2054,20 +2085,20 @@ public class OrderServiceImpl implements Orderservice {
         String orderId = orderBean.getOid();
         MpTemplateMsg template = new MpTemplateMsg();
         MpTemplateMsg.TemplateMsgData data = new MpTemplateMsg.TemplateMsgData();
-        TemplateKeyword first = new TemplateKeyword();
+        MpTemplateMsgDataValue first = new MpTemplateMsgDataValue();
         first.setValue("用户申请退款");
-        TemplateKeyword keyword1 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword1 = new MpTemplateMsgDataValue();
         keyword1.setValue(orderId);
-        TemplateKeyword keyword2 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword2 = new MpTemplateMsgDataValue();
         Double amount = orderBean.getAmount() / 100.0D;
         keyword2.setValue(amount.toString()+ " 元");
-        TemplateKeyword keyword3 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword3 = new MpTemplateMsgDataValue();
         keyword3.setValue(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
-        TemplateKeyword keyword4 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword4 = new MpTemplateMsgDataValue();
         keyword4.setValue(orderBean.getUserName());
-        TemplateKeyword keyword5 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
         keyword5.setValue(orderBean.getPhone());
-        TemplateKeyword remark = new TemplateKeyword();
+        MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
         remark.setValue(request.getReason()+","+request.getRemark());
         data.setFirst(first);
         data.setKeyword1(keyword1);
@@ -2124,4 +2155,210 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
+    /**
+     * 下单支付
+     */
+    private BaseResponse createOrderAndPay(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto, UserLoginInfoDto userLoginInfoDto, OrderExtInfoDTO orderExtInfoDTO) {
+        //创建订单--包括下单购买会员卡创建父子订单
+        CreateOrderOperateDto operateDto = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto);
+        long totalAmount = operateDto.getTotalAmount();
+        int cardAmount =  operateDto.getCardAmount();
+        QueryOrdersResponse.DataBean.OrderBean fatherOrderBean = operateDto.getFatherOrderBean();
+        QueryOrdersResponse.DataBean.OrderBean productOrderBean = operateDto.getProductOrderBean();
+        //支付-- 包含商品券无需支付、唤起微信支付、储值卡支付直接支付、扫脸支付
+        OrderPayResponse orderPayResponse = pay(userLoginInfoDto,createOrderVo,totalAmount,cardAmount,fatherOrderBean);
+        if (orderPayResponse == null) {
+            if(createOrderVo.getFaceCode() != null){
+                createOrderVo.setCardCode(createOrderVo.getFaceCode());
+            }
+            return failPreOrderPay(LogThreadLocal.getTrackingNo(), productOrderBean, createOrderVo.getCardCode());
+        }
+        //更新订单extinfo信息
+        BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, orderExtInfoDTO, productOrderBean, LogThreadLocal.getTrackingNo());
+        if (baseEditResponse != null) {
+            return baseEditResponse;
+        }
+        CreateOrderResponseVo createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, productOrderBean);
+        // 推荐优惠插件用户下单数据上报
+        wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
+        //设置是否唤起微信支付
+        if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
+            createOrderResponse.setPaySuccess(false);
+        } else {
+            createOrderResponse.setPaySuccess(true);
+        }
+        if (!createOrderResponse.getPaySuccess()) {
+            return ResponseUtil.success(createOrderResponse);
+        } else {
+            //如果是商品券支付0元，调用回调接口
+            PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
+            message.setResult_code(100);
+            message.setOut_trade_no(createOrderResponse.getFmId());
+            message.setTrans_id(createOrderResponse.getOid());
+            message.setTotal_fee(0);
+            message.setOpenid(userLoginInfoDto.getOpenId());
+            message.setPlatform_coupon(0);
+            message.setMerchant_coupon(0);
+            //0元订单内部调支付成功
+            this.paySuccessCallback(message);
+            return ResponseUtil.success(createOrderResponse);
+        }
+    }
+
+    /**
+     * 创建订单
+     */
+    private CreateOrderOperateDto createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
+                                              ShoppingCartGoodsDto shoppingCartGoodsDto){
+        CreateOrderOperateDto response = new CreateOrderOperateDto();
+        OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
+        String orderWarnTime = storeResponseDto.getOrderWarnTime();
+        //创建普通订单
+        Function<Object, CreateOrderResponse> createOrder = (var -> {
+            BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,orderWarnTime);
+            //查询第三方商品编号
+            baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
+            //保存门店渠道信息
+            baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
+            CreateOrderRequest createOrderRequest = new CreateOrderRequest();
+            baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+            createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
+            MqMessageRequest mqMessageRequest = new MqMessageRequest();
+            mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
+            mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
+            createOrderRequest.setMqMessageRequest(mqMessageRequest);
+            createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+            return orderCenterSdkService.createOrderFlow(createOrderRequest);
+        });
+        //创建父子订单
+        Function<Object, CreateFatherSonOrderResponse> createFatherSonOrder = (var -> {
+            CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,orderWarnTime);
+            //查询第三方商品编号
+            createFatherSonOrderRequest = getProductCustomerCodeNew(createFatherSonOrderRequest);
+            MqMessageRequest mqMessageRequest = new MqMessageRequest();
+            mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
+            mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
+            createFatherSonOrderRequest.setMqMessageRequest(mqMessageRequest);
+            return orderCenterSdkService.createFatherSonOrder(createFatherSonOrderRequest);
+        });
+
+        long totalAmount = 0;
+        int cardAmount = 0;
+        QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
+        QueryOrdersResponse.DataBean.OrderBean productBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
+        if (createOrderVo.getBuyMemberCard() != null && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getRuleId()) && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getPaidId())) {
+            //父子订单
+            int cardOriginalAmount = shoppingCartGoodsDto.getCardOriginalAmount() == null ? 0 : shoppingCartGoodsDto.getCardOriginalAmount();
+            int cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() == null ? 0 : shoppingCartGoodsDto.getCardDiscountAmount();
+            cardAmount = cardOriginalAmount - cardDiscountAmount;
+            //创建父子订单
+            CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder.apply(null);
+            if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createFatherSonOrderResponse.getErrcode())) {
+                throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
+            }
+            List<QueryOrdersResponse.DataBean.OrderBean> orderBeanList = createFatherSonOrderResponse.getOrderBeanList();
+            List<QueryOrdersResponse.DataBean.OrderBean> fatherBeanList = orderBeanList.stream().filter(orderBeanTemp -> orderBeanTemp.getIsParent()).collect(Collectors.toList());
+            List<QueryOrdersResponse.DataBean.OrderBean> productBeanList = orderBeanList.stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(fatherBeanList)) fatherBeanListOne = fatherBeanList.get(0);
+            if (CollectionUtils.isNotEmpty(productBeanList)) productBeanListOne = productBeanList.get(0);
+            //订单总金额 商品+会员卡
+            totalAmount = orderBeanList.stream().mapToLong(QueryOrdersResponse.DataBean.OrderBean::getAmount).count();
+        } else {
+            //创建普通订单
+            CreateOrderResponse createOrderFlowResponse = createOrder.apply(null);
+            if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createOrderFlowResponse.getErrcode())) {
+                throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
+            }
+            fatherBeanListOne = createOrderFlowResponse.getData();
+            productBeanListOne = createOrderFlowResponse.getData();
+            totalAmount = productBeanListOne.getAmount();
+        }
+        response.setTotalAmount(totalAmount);
+        response.setCardAmount(cardAmount);
+        response.setFatherOrderBean(fatherBeanListOne);
+        response.setProductOrderBean(productBeanListOne);
+        return response;
+    }
+
+    /**
+     * 支付
+     * 包含唤起微信支付、储值卡支付直接支付、扫脸支付、商品券无需支付
+     */
+    private OrderPayResponse pay(UserLoginInfoDto userLoginInfoDto,CreateOrderVo createOrderVo,long totalAmount,int cardAmount,
+                                 QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne){
+        //<!---创建订单公共方法执行逻辑--->
+        OrderPayResponse orderPayResponse = null;
+        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto, createOrderVo.getPartnerId());
+        //支付金额异常
+        if (totalAmount < 0) {
+            throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
+        }
+        //唤起微信支付
+        if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
+            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount);
+            return orderPayResponse;
+        }
+        //储值卡支付
+        if (totalAmount > 0 && StringUtils.isNotBlank(createOrderVo.getCardCode())) {
+            //svc卡支付
+            orderPayResponse = svcPay(createOrderVo.getCardCode(), fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo());
+            return orderPayResponse;
+        }
+        //扫脸支付
+        if (totalAmount > 0 && StringUtils.isNotBlank(createOrderVo.getFaceCode())) {
+            //svc卡支付
+            orderPayResponse = facePay(createOrderVo.getFaceCode(), fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo());
+            return orderPayResponse;
+        }
+        //0元订单，商品券订单等等
+        if (totalAmount == 0){
+            // 0元订单如果不需要支付，自定义支付单号
+            String fmId = "SPAY" + ValidationCode.getRandomUuid();
+            orderPayResponse = orderAdapter.getOrderPayResponse(fatherBeanListOne.getCompanyId(), paymentRequest, fatherBeanListOne.getOid(), fmId);
+            return orderPayResponse;
+        }
+        return orderPayResponse;
+    }
+
+    /**
+     * 扫脸支付
+     */
+    public OrderPayResponse facePay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo) {
+//        CodePayRequest request = new CodePayRequest();
+        FacePayRequestDto request = new FacePayRequestDto();
+        String partnerId = orderBean.getCompanyId();
+        request.setBody(orderBean.getShopName());
+        request.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+        request.setCode(cardCode);
+        request.setPartnerId(partnerId);
+        request.setStoreId(orderBean.getShopId());
+        request.setAmount(orderBean.getAmount());
+        request.setTransId(orderBean.getOid());
+        request.setStationId("1");
+        request.setOperatorId("1");
+        request.setVer("2");
+        //支付服务扫脸付接口
+        LogUtil.info("facePay_request", JSONObject.toJSON(request), null);
+        com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> responseDto = null;
+        try {
+            responseDto = paymentNewClient.facePay(request);
+            LogUtil.info("facePay_response", null,JSONObject.toJSON(responseDto));
+        }catch (Exception e){
+            LogUtil.error("facePay_error", null, null, e);
+        }
+        if (responseDto == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseDto.getCode()) || responseDto.getData() == null) {
+            return null;
+        }
+        FacePayResponseDto response = responseDto.getData();
+        OrderPayResponse orderPayResponse = new OrderPayResponse();
+        orderPayResponse.setFmId(response.getFmId());
+        orderPayResponse.setPayTransId(response.getPayTransId());
+        orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
+        orderPayResponse.setOpenId(paymentRequest.getOpenId());
+        orderPayResponse.setPartnerId(orderBean.getCompanyId());
+        orderPayResponse.setOrderId(orderBean.getOid());
+        return orderPayResponse;
+    }
+
+
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.order.FacePayRequestDto;
+import cn.freemud.entities.dto.order.FacePayResponseDto;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: PaymentNewClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:09
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@FeignClient(name = "payment-service-new",url="${payment.new.baseUrl}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface PaymentNewClient {
+
+    /**
+     * 扫脸支付
+     */
+    @PostMapping("paymentcenter/facePay")
+    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
+
+}

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.0.RELEASE</version>
+    <version>1.1.1.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -3,4 +3,5 @@
 | 版本号       | 版本说明         | 更新人 | 更新时间   |
 | ------------ | ---------------- | ------ | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
-| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
+| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.6.RELEASE</version>
+            <version>2.7.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/constant/ShoppingCartConstant.java

@@ -15,6 +15,9 @@ package cn.freemud.constant;
 
 public class ShoppingCartConstant {
 
+    public final static String SHOPPING_CART_INVALIAD_GOODS="因商家变更了商品，导致选购失败，请刷新门店后重新尝试选购商品";
+    public final static String SHOPPING_CART_EMPTY_GOODS_LIST="因商品变更或其他原因，导致加购失效，无法结算，请重新尝试选购商品";
+
     public final static String SHOPPING_CART_INVALID_GOODS_EXIST = "有商品不在售卖状态，请重新提交结算";
 
     public final static String SHOPPING_CART_ACTIVITY_CHANGE = "商品价格有变动，将按照最新活动价格计算哦";

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

@@ -48,5 +48,12 @@ public class AddGoodsByWeixinCardRequestVo {
     @NotNull(message = "couponType不能为空")
     private Integer couponType;
 
+
+
     private String skuId;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private Integer businessType ;
 }

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

@@ -75,7 +75,14 @@ public class AddShoppingCartGoodsRequestVo {
 
 
     private String appType;
+
     private String tableNumber;
 
     private Integer qty;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private Integer businessType ;
+
 }

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

@@ -45,7 +45,9 @@ public class ShoppingCartInfoRequestVo {
     @NotEmpty(message = "appId不能为空")
     private String appId;
     /**
-     * 是否查询用户优惠券 1-查询用户优惠券 flag=1  用户去结算
+     * 是否为结算页
+     *  1：结算页 0：点餐页
+     * 结算页会查询用户优惠券，点餐页不会查询用户优惠券
      */
     private Integer flag;
     /**
@@ -90,6 +92,11 @@ public class ShoppingCartInfoRequestVo {
      */
     private BuyMemberCard buyMemberCard;
 
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private Integer businessType ;
+
     @Data
     public final static class SendGoods {
         /**

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

@@ -58,4 +58,9 @@ public class UpdateShoppingCartGoodsQtyRequestVo {
      */
     private Integer carVer;
 
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private Integer businessType ;
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/enums/BusinessTypeEnum.java

+package cn.freemud.enums;
+
+import java.util.Arrays;
+
+public enum BusinessTypeEnum {
+    SAAS_PICKUP(0,"自提","saas"),
+    SAAS_DELIVERY(1,"外卖","saas_delivery"),
+    SAAS_MALL(2,"商城","saas_mall"),
+    SAAS_WC(3,"围餐","wc");
+
+
+    private Integer type;
+    private String name;
+    private String code;
+
+    BusinessTypeEnum(Integer type, String name, String code) {
+        this.type = type;
+        this.name = name;
+        this.code = code;
+    }
+
+    public static BusinessTypeEnum getByType(Integer type) {
+        return Arrays.stream(BusinessTypeEnum.values())
+                .filter(e -> e.type.equals(type))
+                .findFirst().orElse(BusinessTypeEnum.SAAS_PICKUP);
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

@@ -37,7 +37,6 @@ public interface CommonService {
         request.setStoreCode(storeCode);
         StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
         BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
-        ApiLog.info("CommonService_getOrgIds",request,orgList);
         if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
             return orgList.getData();
         }

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

@@ -164,7 +164,7 @@ public interface ShoppingCartNewService {
                 setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_OTHER_ACTIVITY_WHEN_ADD_GOODS_COUPON);
             }
             //校验合法性,更新缓存中购物车信息
-            allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+            updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
         }
     }
 
@@ -249,12 +249,11 @@ public interface ShoppingCartNewService {
      * @param allCartGoodsList
      * @param productBeanListSpuClass
      */
-    default Map<String, List<CartGoods>> addNotProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, CartGoods cartGoods
-            , String goodsId, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> allCartGoodsList
-            , List<ProductBeanDTO> productBeanListSpuClass) {
+    default void addNotProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, CartGoods cartGoods
+            , String goodsId, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> allCartGoodsList) {
 
         // 校验合法性,更新缓存中购物车信息
-        allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+        updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
 
         // 如果购物车中有商品券，则当前添加的商品是特价商品时，需要提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
         boolean haveCouponProduct = allCartGoodsList.parallelStream().anyMatch(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX));
@@ -262,10 +261,6 @@ public interface ShoppingCartNewService {
             // 如果购物车先加入商品券，再加入促销商品，toast提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_GOODS_COUPON_WHEN_ADD_SPECIAL_GOODS);
         }
-
-        Map<String, List<CartGoods>> map = new HashMap<>();
-        map.put(productBeanListSpuClass.get(0).getName(), allCartGoodsList);
-        return map;
     }
 
 }

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

@@ -97,7 +97,8 @@ public class AdditionalPromotionService implements IPromotionService {
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoods = shoppingCartInfoRequestVo.getSendGoods();
         List<String> goodsIds = sendGoods.stream().map(ShoppingCartInfoRequestVo.SendGoods::getGoodsId).collect(Collectors.toList());
         Map<String, ShoppingCartInfoRequestVo.SendGoods> goodQtyMap = sendGoods.stream().collect(Collectors.toMap(ShoppingCartInfoRequestVo.SendGoods::getGoodsId, Function.identity(), (k1, k2) -> k1));
-        List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId(), goodsIds, shoppingCartBaseService);
+        List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(shoppingCartInfoRequestVo.getPartnerId()
+                , shoppingCartInfoRequestVo.getShopId(), goodsIds,shoppingCartInfoRequestVo.getBusinessType(), shoppingCartBaseService);
         if (CollectionUtils.isEmpty(productBeanList)) {
             throw new ServiceException(ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST);
         }

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

@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsBaseResponseVo;
+import cn.freemud.enums.BusinessTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.utils.LogUtil;
@@ -18,9 +19,11 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.naming.Name;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -99,7 +102,7 @@ public class AssortmentSdkService {
         // 根据不同点餐类型获取不同购物车实例
         BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.getCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
         if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
-            return null;
+            return new ArrayList<>();
         }
 
         return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
@@ -119,13 +122,16 @@ public class AssortmentSdkService {
         cartParamDto.setTableNumber(tableNumber);
         cartParamDto.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(cartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
         BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.setCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
-        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())) {
             return null;
         }
 
         return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
     }
 
+    @Value("${shopping.cart.check.action}")
+    private String shoppingCartCheckAction;
+
     /**
      * 调用SDK校验购物车
      *
@@ -145,10 +151,13 @@ public class AssortmentSdkService {
         checkCartRequest.setStoreId(storeId);
         checkCartRequest.setTableNumber(tableNumber);
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
-        long checkStartTime = System.currentTimeMillis();
-        BaseResponse<CheckCartRequest> baseResponse = shoppingCartService.checkAllCartGoods(checkCartRequest);
-        //LogUtil.info("shoppingCartBaseService checkAllCartGoods ", checkStartTime, JSON.toJSONString(checkCartRequest), JSON.toJSONString(baseResponse));
-        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())) {
+        BaseResponse<CheckCartRequest> baseResponse ;
+        if ("checkAllCartGoodsNew".equals(shoppingCartCheckAction)){
+            baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
+        }else {
+            baseResponse=shoppingCartService.checkAllCartGoods(checkCartRequest);
+        }
+        if (baseResponse == null) {
             return null;
         }
         return baseResponse.getResult();
@@ -162,12 +171,13 @@ public class AssortmentSdkService {
      * @param goodsIds
      * @return
      */
-    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds, ShoppingCartBaseService shoppingCartService) {
+    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds,Integer businessType, ShoppingCartBaseService shoppingCartService) {
         GetProductInfoRequest request = new GetProductInfoRequest();
         request.setGoodsIds(goodsIds);
         request.setPartnerId(partnerId);
         request.setStoreId(storeId);
         request.setTrackingNo(LogThreadLocal.getTrackingNo());
+        request.setBusinessType(BusinessTypeEnum.getByType(businessType).getCode());
         BaseResponse<List<ProductBeanDTO>> baseResponse =
                 shoppingCartService.getProductsInfo(request);
         if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {

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

@@ -42,7 +42,10 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
     private ShoppingCartBaseServiceImpl shoppingCartBaseService;
 
     @Override
-    public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+    public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto,
+                                                ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult,
+                                                List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
+                                                UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getSendGoods())) {
             return;
         }
@@ -52,7 +55,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList = new ArrayList<>();
         sendActivities.forEach(sendActivity -> sendGoodsList.addAll(sendActivity.getSendGoods()));
-        List<ProductBeanDTO> productBeanDTOS = buildActivityProduct(activityQueryDto, sendGoodsList);
+        List<ProductBeanDTO> productBeanDTOS = buildActivityProduct(activityQueryDto, sendGoodsList,shoppingCartInfoRequestVo.getBusinessType());
         if (CollectionUtils.isEmpty(productBeanDTOS)) {
             return;
         }
@@ -145,10 +148,12 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
      * @param sendGoodsList
      * @return
      */
-    private List<ProductBeanDTO> buildActivityProduct(ActivityQueryDto activityQueryDto, List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList) {
+    private List<ProductBeanDTO> buildActivityProduct(ActivityQueryDto activityQueryDto, List<ActivityCalculationDiscountResponseDto
+            .CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList,Integer businessType) {
         //获取
         List<String> goodsIds = sendGoodsList.stream().map(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods::getGoodsId).collect(Collectors.toList());
-        List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(activityQueryDto.getPartnerId(), activityQueryDto.getStoreId(), goodsIds, shoppingCartBaseService);
+        List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(activityQueryDto.getPartnerId()
+                , activityQueryDto.getStoreId(), goodsIds, businessType ,shoppingCartBaseService);
         if (CollectionUtils.isEmpty(productBeanList)) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GIFTS_PRODUCT_NOT_EXIST);
         }

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

@@ -102,7 +102,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         }
         // 获取商品信息
         List<ProductBeanDTO> productBeanListSpuClass =
-                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), mealCartBaseService);
+                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2),requestVo.getBusinessType(), mealCartBaseService);
         if (productBeanListSpuClass == null) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_ADD_ERROR);
         }
@@ -116,7 +116,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         // 当添加的商品不是商品券时
         if (!spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             //添加非商品券商品
-            addNotProductGoods(requestVo, cartGoods, goodsId, userId, responseVo, allCartGoodsList, productBeanListSpuClass);
+            addNotProductGoods(requestVo, cartGoods, goodsId, userId, responseVo, allCartGoodsList);
         } else {
             // 当商品是商品券，里面会判断如果购物车中已有商品券，会将cartGoods的CartGoodsUid设为null
             this.addProductGoods(requestVo, cartGoods, spuId2, userId, responseVo,

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

@@ -71,6 +71,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST;
+import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS;
 import static java.util.stream.Collectors.toList;
 
 @Slf4j
@@ -174,7 +176,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
 
             // 判断商品状态是否可以加入购物车
-            List<ProductBeanDTO> productInfos = assortmentSdkService.getProductsInfoSdk(request.getPartnerId(), request.getShopId(), Arrays.asList(getProductsVo.getSpuId()), this.shoppingCartBaseService);
+            List<ProductBeanDTO> productInfos = assortmentSdkService.getProductsInfoSdk(request.getPartnerId(), request.getShopId(), Arrays.asList(getProductsVo.getSpuId()),request.getBusinessType(),this.shoppingCartBaseService);
             if (CollectionUtils.isNotEmpty(productInfos)) {
                 ProductBeanDTO productBean = productInfos.get(0);
                 Integer status = productBean.getStatus();
@@ -224,7 +226,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             spuId2 = validCoupon(partnerId, storeId, spuId, productIds);
         }
         // 获取商品详细信息
-        List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), this.shoppingCartBaseService);
+        List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId
+                , Collections.singletonList(spuId2),addShoppingCartGoodsRequestVo.getBusinessType(), this.shoppingCartBaseService);
 
         //缓存中获取购物车商品信息
         // 注意，围餐和点餐redis数据结构不一样
@@ -241,11 +244,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 当添加的商品不是商品券时
         if (!spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             //添加非商品券商品
-            Map<String, List<CartGoods>> map = addNotProductGoods(addShoppingCartGoodsRequestVo, cartGoods, goodsId, userId, shoppingCartGoodsResponseVo, allCartGoodsList, productBeanListSpuClass);
-            for (Map.Entry<String, List<CartGoods>> entry : map.entrySet()) {
-                productName = entry.getKey();
-                allCartGoodsList = entry.getValue();
-            }
+             addNotProductGoods(addShoppingCartGoodsRequestVo, cartGoods, goodsId, userId, shoppingCartGoodsResponseVo, allCartGoodsList);
         } else {
             // 当商品是商品券，里面会判断如果购物车中已有商品券，会将cartGoods的CartGoodsUid设为null
             this.addProductGoods(addShoppingCartGoodsRequestVo, cartGoods, spuId2, userId, shoppingCartGoodsResponseVo,
@@ -328,6 +327,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // check购物车中所有商品
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
+            shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
         }
         cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
@@ -408,26 +408,20 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String appId = shoppingCartInfoRequestVo.getAppId();
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
-//        Integer flag = shoppingCartInfoRequestVo.getFlag();
-        // List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();
 
         // 获取购物车商品
-
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, "", shoppingCartBaseService);
-        if (cartGoodsList == null) {
-            cartGoodsList = new ArrayList<>();
-        }
-        // check购物车中所有商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartBaseService);
-        if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
-            shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
+        // 如果购物车商品不为空， 则check购物车中所有商品
+        if (CollectionUtils.isNotEmpty(cartGoodsList)){
+            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartBaseService);
+            if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
+                shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
+                shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
+            }
+            cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
+            // 重新存储最新购物车
+            assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, assortmentCustomerInfoVo.getSessionId(), "", this.shoppingCartBaseService);
         }
-        cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
-        //1.5.4 多规格的sku商品计算包装费
-        //checkSkuOnVersion(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo);
-        // 重新存储最新购物车
-        assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, assortmentCustomerInfoVo.getSessionId(), "", this.shoppingCartBaseService);
-
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
         // 当couponCode不为空时，需参与价格计算
         if (StringUtils.isNotEmpty(couponCode)) {
@@ -436,14 +430,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             coupon.setActivityCode(activityCode);
             coupons.add(coupon);
         }
-        /*if (CollectionUtils.isNotEmpty(sendGoodsList)) {
-            processSendGoods(sendGoodsList, partnerId, storeId);
-        }*/
         // 获取优惠信息
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, shoppingCartInfoRequestVo.getOrderType(), cartGoodsList, coupons, null);
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
-//            return shoppingCartGoodsResponseVo;
         }
 
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, shoppingCartInfoRequestVo.getOrderType());
@@ -585,7 +575,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             coupons.add(coupon);
         }
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
-            processSendGoods(sendGoodsList, partnerId, storeId, shoppingCartBaseService);
+            processSendGoods(sendGoodsList, partnerId, storeId , shoppingCartInfoRequestVo.getBusinessType() , shoppingCartBaseService);
         } else {
             //组装加价购商品
             if (null != premiumExchangeActivity && CollectionUtils.isNotEmpty(premiumExchangeActivity.getProducts())) {
@@ -838,10 +828,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param partnerId
      * @param storeId
      */
-    private void processSendGoods(List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String partnerId, String storeId, ShoppingCartBaseService shoppingCartService) {
+    private void processSendGoods(List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
+            , String partnerId, String storeId,Integer businessType, ShoppingCartBaseService shoppingCartService) {
         List<String> goodsIds = sendGoodsList.parallelStream().map(ShoppingCartInfoRequestVo.SendGoods::getGoodsId).collect(Collectors.toList());
         List<ProductBeanDTO> productBeanList =
-                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, goodsIds, shoppingCartService);
+                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, goodsIds, businessType, shoppingCartService);
         // 将productBeanList转换为Map，key为pid，即goodsId
         Map<String, ProductBeanDTO> productBeanMap = productBeanList.parallelStream()
                 .collect(Collectors.toMap(ProductBeanDTO::getPid, Function.identity(), (k1, k2) -> k1));
@@ -1018,6 +1009,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), "", shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
+            shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
         }
         List<CartGoods> allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
 
@@ -1033,40 +1025,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 重新set购物车信息到缓存中
         assortmentSdkService.setShoppingCart(addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(),
                 userId, nowCartGoodsList, addShoppingCartGoodsRequestVo.getSessionId(), addShoppingCartGoodsRequestVo.getTableNumber(), this.shoppingCartBaseService);
+        oldAllCartGoodsList.clear();
+        oldAllCartGoodsList.addAll(nowCartGoodsList);
         return nowCartGoodsList;
     }
 
     /**
-     * 添加非商品券商品
-     *
-     * @param addShoppingCartGoodsRequestVo
-     * @param cartGoods
-     * @param goodsId
-     * @param userId
-     * @param shoppingCartGoodsResponseVo
-     * @param allCartGoodsList
-     * @param productBeanListSpuClass
-     */
-    private Map<String, List<CartGoods>> addNotProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, CartGoods cartGoods
-            , String goodsId, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, List<CartGoods> allCartGoodsList
-            , List<ProductBeanDTO> productBeanListSpuClass) {
-
-        //校验合法性,更新缓存中购物车信息
-        allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
-
-        // 如果购物车中有商品券，则当前添加的商品是特价商品时，需要提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
-        boolean haveCouponProduct = allCartGoodsList.parallelStream().anyMatch(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX));
-        if (haveCouponProduct && isSpecialGoods(addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), userId, addShoppingCartGoodsRequestVo.getAppId(), goodsId, addShoppingCartGoodsRequestVo.getOrderType())) {
-            // 如果购物车先加入商品券，再加入促销商品，toast提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
-            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_GOODS_COUPON_WHEN_ADD_SPECIAL_GOODS);
-        }
-
-        Map<String, List<CartGoods>> map = new HashMap<>();
-        map.put(productBeanListSpuClass.get(0).getName(), allCartGoodsList);
-        return map;
-    }
-
-    /**
      * 添加商品券商品
      *
      * @param addShoppingCartGoodsRequestVo
@@ -1108,7 +1072,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_OTHER_ACTIVITY_WHEN_ADD_GOODS_COUPON);
             }
             //校验合法性,更新缓存中购物车信息
-            allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+            updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
         }
     }
 
@@ -1164,11 +1128,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void setAddAndUpdateResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
             , List<CartGoods> cartGoodsList, String toastMsg, String partnerId, String storeId, String userId, String opt, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        //updateCartGoodsResponse(shoppingCartGoodsResponseVo, calculationDiscountResult);
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
         shoppingCartGoodsResponseVo.setProductsCount(cartGoodsList.size());
         if (StringUtils.isNotEmpty(toastMsg)) {
+            toastMsg=shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())?SHOPPING_CART_EMPTY_GOODS_LIST:SHOPPING_CART_INVALIAD_GOODS;
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, toastMsg);
+            //结算页，只有商品全部非法（即products为空）时，才提示changed为true toastMsg 不为空
+            if (shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())){
+                shoppingCartGoodsResponseVo.setChanged(CollectionUtils.isEmpty(cartGoodsList));
+                shoppingCartGoodsResponseVo.setToastMsg(CollectionUtils.isEmpty(cartGoodsList)?toastMsg:"");
+            }
+
         }
         // 给前端展示
         shoppingCartGoodsResponseVo.setNewPackAmount(shoppingCartGoodsResponseVo.getPackAmount());
@@ -1195,7 +1165,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);
             shoppingCartGoodsResponseVo.setTotalAmount(totalAmount);
         }
-        shoppingCartGoodsResponseVo.setChanged(false);
+
     }
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 //券活动测试 地址：http://115.159.65.101:8003 线上 http://10.51.0.7:8003
-@FeignClient(name = "ACTIVITY", url = "${saas.activityclient.feign.url}")
+@FeignClient(name = "promotion-service", url = "${saas.activityclient.feign.url}")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface ActivityClient {