sunyu::update::merge code

assortment-shoppingcart-sdk/pom.xml

@@ -67,4 +67,4 @@
     </dependencies>
 
 
-</project>
+</project>
\ No newline at end of file

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.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ErrorLog;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
@@ -11,6 +14,7 @@ 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;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -32,6 +36,7 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
  */
 @Component
+@Slf4j
 public class ShoppingCartAdapter {
     private static final String ATTRIBUTEID = "attributeId";
     private static final String ATTRIBUTENAME = "attributeName";
@@ -258,6 +263,7 @@ public class ShoppingCartAdapter {
      * @param productBeans 购物车中所有的productId对应的商品详情
      */
     public void updateCartGoodsInfoNew(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
+        log.info("【updateCartGoodsInfoNew】： cartGoods: {}, productBeans: {} ,trackingNo:{}", JSONObject.toJSONString(cartGoods), JSONObject.toJSONString(productBeans), LogThreadLocal.getTrackingNo());
         try {
             Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
             if (!firstProduct.isPresent()) {

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

@@ -37,15 +37,18 @@ public class ShoppingCartConstant {
      * 商品价格校验失败
      */
     public static final int PRODUCT_PRICE_CHANGE = 102;
+    public static final String CART_PRODUCT_PRICE_CHANGE = "您选择的【$spuName】商品价格将发生变化;";
 
     /**
      * 商品不存在
      */
     public static final int PRODUCT_NOTFOUND= 103;
+    public static final String CART_PRODUCT_NOT_FOUND = "您选择的【$spuName】商品不在当前门店菜单中;";
 
     /**
      * 商品状态校验失败
      */
     public static final int PRODUCT_DOWN= 104;
+    public static final String CART_PRODUCT_INVALID_STATE = "您选择的【$spuName】商品已失效;";
 }
 

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

@@ -38,6 +38,7 @@ 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.util.CartResponseUtil;
 import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -231,7 +232,6 @@ public interface ShoppingCartBaseService {
             ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
             com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProductAboutReason(validateShopProductRequest);
 
-            //TODO 疑问
             if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
                 checkCartRequest.getCartGoodsList().clear();
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
@@ -239,37 +239,67 @@ public interface ShoppingCartBaseService {
                 return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
             }
             ValiadShopProductResponse validateResult = valiadResponse.getData();
+            CartGoodsStates cartGoodsStates = new CartGoodsStates();
+
             //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
             if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
+                List<String> invalidSpu = new ArrayList<>();
+                List<String> notFoundSpu = new ArrayList<>();
+                List<String> changePriceSpu = new ArrayList<>();
                 for (int i = 0; i < validateResult.getFailureList().size(); i++) {
-                    checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                    switch (validateResult.getFailureList().get(i).getCode()){
-                        case PRODUCT_PRICE_CHANGE :
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
-                            break;
-                        case PRODUCT_NOTFOUND:
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST);
-                            break;
-                        case PRODUCT_DOWN:
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
-                            break;
-                        default:
-                            break;
-                    }
-//                    return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
-                }
-                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
-                for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
-                    if (validateResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
-                        cartGoods.setCartGoodsUid(null);
+                    ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
+                    for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                        if (cartGoods.getSkuId().equals(validaProduct.getSkuId())) {
+                            String spuName = null == validaProduct.getProductType() ? (StringUtils.isNotEmpty(cartGoods.getSkuName()) ? cartGoods.getSkuName() :
+                                            StringUtils.isNotEmpty(cartGoods.getName()) ? cartGoods.getName() : "") : validaProduct.getProductType().getName();
+                            if (PRODUCT_DOWN == validaProduct.getCode()) {
+                                if (StringUtils.isNotEmpty(spuName)){
+                                    invalidSpu.add(spuName);
+                                }
+                                cartGoodsStates.setHasInvalidGoods(true);
+                                cartGoods.setCartGoodsUid(null);
+                                break;
+                            }
+                            if (PRODUCT_NOTFOUND == validaProduct.getCode()) {
+                                if (StringUtils.isNotEmpty(spuName)) {
+                                    notFoundSpu.add(spuName);
+                                }
+                                cartGoodsStates.setHasInvalidGoods(true);
+                                cartGoods.setCartGoodsUid(null);
+                                break;
+                            }
+                            if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
+                                if (StringUtils.isNotEmpty(spuName)) {
+                                    changePriceSpu.add(spuName);
+                                }
+                                List<ProductBeanDTO> productList = validateResult.getFailureList().stream().filter(f-> f.getCode() == PRODUCT_PRICE_CHANGE).map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+
+                                shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
+                                break;
+                            }
+                        }
                     }
                 }
+
+                String toastMsg = "";
+                if (CollectionUtils.isNotEmpty(invalidSpu)){
+                    toastMsg = toastMsg.concat(CART_PRODUCT_INVALID_STATE.replace("$spuName",StringUtils.join(invalidSpu,",")));
+                }
+                if (CollectionUtils.isNotEmpty(notFoundSpu)){
+                    toastMsg = toastMsg.concat(CART_PRODUCT_NOT_FOUND.replace("$spuName",StringUtils.join(notFoundSpu,",")));
+                }
+
+                if (CollectionUtils.isNotEmpty(changePriceSpu)){
+                    toastMsg = toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName",StringUtils.join(changePriceSpu,",")));
+                }
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(toastMsg);
+
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
                 checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
             }
             List<ProductBeanDTO> productList = validateResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
-            CartGoodsStates cartGoodsStates = new CartGoodsStates();
+
             for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                 // 当goodsId为空或商品是商品券时直接跳过
                 if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())) {
@@ -291,12 +321,11 @@ public interface ShoppingCartBaseService {
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
             }
-            //todo 小料
-            if (checkCartRequest.getCartGoodsList().stream().anyMatch(cart -> cart.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()))) {
-                checkCartRequest.getCartGoodsList().removeIf(k -> k.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()));
-                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
-            }
+//            if (checkCartRequest.getCartGoodsList().stream().anyMatch(cart -> cart.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()))) {
+//                checkCartRequest.getCartGoodsList().removeIf(k -> k.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()));
+//                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+//                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
+//            }
             return CartResponseUtil.success(checkCartRequest);
         } catch (Exception e) {
             ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
@@ -306,8 +335,6 @@ public interface ShoppingCartBaseService {
         }
     }
 
-
-
     /**
      * 更新购物车详细信息
      * 并check购物车中商品是否价格变更、是否非法（例如商品下架）
@@ -1009,5 +1036,4 @@ public interface ShoppingCartBaseService {
         }
         return null;
     }
-
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotNull;
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -27,4 +28,21 @@ public class QueryCartInfoRequestVo {
     @ApiModelProperty(value = "门店id",required = true)
     @NotEmpty(message = "门店id不可为空")
     private String storeId;
+    @ApiModelProperty(value = "sessionId",required = true)
+    @NotEmpty(message = "用户sessionId不可为空")
+    private String sessionId;
+
+    @ApiModelProperty(value = "appId",required = true)
+    @NotEmpty(message = "appId不可为空")
+    private String appId;
+    @ApiModelProperty(value = "menuType",notes = "业务类型： 0 : 自提 1：外卖 2：微商城",required = true)
+    @NotEmpty(message ="业务类型不可为空")
+    private String menuType ;
+
+    @ApiModelProperty(value = "订单类型")
+    @NotNull(message = "订单类型不可为空")
+    private Integer orderType;
+
+    @ApiModelProperty(value = "收货地址id",notes = "svc卡支付外卖订单必传")
+    private String receiveId;
 }
\ No newline at end of file

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

@@ -87,9 +87,12 @@ public enum ResponseResult {
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
     SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
+
     SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
     SHOPPING_CART_GOODS_CHECK_ERROR("44023", "当前餐盘中没有可用券的饮品"),
 
+    SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
+    SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
     /**
      * 订单状态码
      */

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

@@ -249,7 +249,6 @@ public class AssortmentSdkService {
         return baseResponse.getResult();
     }
 
-
     /**
      * 调用SDK获取商品详情
      *

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

@@ -396,14 +396,29 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
+    /**
+     * 券码用-查询购物车最新信息，计算优惠
+     * @param requestVo
+     * @return
+     */
     public BaseResponse getCartInfoByUser(QueryCartInfoRequestVo requestVo){
+        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
+        // 获取用户信息
+        CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(requestVo.getSessionId());
         // 获取购物车商品?
-         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
-         List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList);
-         return ResponseUtil.success(resList);
+        List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
+        // 当couponCode不为空时，需参与价格计算
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList);
+        // 促销活动的优惠金额计算
+        calculationService.updateShoppingCartGoodsDiscount(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), requestVo.getAppId(), requestVo.getOrderType(), assortmentCustomerInfoVo.isMemberPaid(), requestVo.getMenuType(), requestVo.getReceiveId(), null,
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+        String moneyCoupon = assortmentSdkService.getShoppingCartCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), shoppingCartBaseService);
+        List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList,moneyCoupon);
+        return ResponseUtil.success(resList);
     }
 
 
+
     /**
      * 查询购物车可用券
      */
@@ -509,7 +524,32 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         // check购物车中所有商品
-        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        List<CartGoods> allCartGoodsList = new ArrayList<>();
+
+        CheckCartRequest checkCartRequest = checkCartGoodsForToPay(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        if (null != checkCartRequest) {
+            //商品不再售卖状态或价格变动，直接返回报错
+            if (null != checkCartRequest.getShoppingCartGoodsResponseVo()) {
+                com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
+                if (cartGoodsResponseVo.getCartGoodsStates() != null && cartGoodsResponseVo.getCartGoodsStates().isHasInvalidGoods()) {
+                    return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_INVAILD);
+                }
+                if (cartGoodsResponseVo.getCartGoodsStates() != null && cartGoodsResponseVo.getCartGoodsStates().isPriceChanged()) {
+                    return ResponseUtil.error(ResponseResult.SHOPPING_CART_ACTIVITY_CHANGE);
+                }
+                shoppingCartGoodsResponseVo.setToastMsg(cartGoodsResponseVo.getToastMsg());
+            }
+            allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
+        }
+        //加价购商品
+        List<CartGoods> reduceGoods = cartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType() == GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType()).collect(Collectors.toList());
+        //添加商品为加价购商品
+        if (CollectionUtils.isNotEmpty(reduceGoods)) {
+            allCartGoodsList.addAll(reduceGoods);
+        }
+        //恢复套餐商品空键位
+//        checkNewCartGoods(allCartGoodsList,2,map);
+
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, tableNumber, shoppingCartBaseService);
 
@@ -559,10 +599,41 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
         }
-        // 新门店check购物车中所有商品
-        cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+
+        List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
+        if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()){
+            onlyCheckGoodsList.addAll(cartGoodsList);
+            // 新门店check购物车中所有商品
+            onlyCheckGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, onlyCheckGoodsList);
+        }else{
+            // 新门店check购物车中所有商品
+            cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        }
+
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()) {
-            return ResponseUtil.success(shoppingCartGoodsResponseVo);
+            if (StringUtils.isNotEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
+                //设置更新响应信息,校验失败只弹框提示消息，不切换门店，故将门店id重置为原来门店
+                shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
+                shoppingCartInfoRequestVo.setShopId(requestVo.getFromShopId());
+                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
+                return ResponseUtil.success(shoppingCartGoodsResponseVo);
+            }else {
+                // 新门店check购物车中所有商品
+                cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+                // 重新存储新门店购物车
+                assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+                //清空商品券商品
+                clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
+                // 当couponCode不为空时，需参与价格计算
+                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList);
+
+                // 促销活动的优惠金额计算
+                calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
+                        cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+                //设置更新响应信息
+                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
+                shoppingCartGoodsResponseVo.setChanged(false);
+            }
         }
         // 新门店check购物车中所有商品
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE4.getCode()) {
@@ -1058,7 +1129,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> allCartGoodsList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(checkGoods, partnerId,
+            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -1077,6 +1148,29 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
+    /**
+     * 【去支付使用】购物车商品check，加购商品不在菜单不check
+     */
+    private CheckCartRequest checkCartGoodsForToPay(String partnerId, String storeId, Integer orderType, String menuType,
+                                           ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) {
+
+        //去除套餐商品空键位
+//        Map<String, String> map = checkNewCartGoods(cartGoodsList,1,null);
+
+        //筛选数量不为0商品
+        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList());
+
+        //筛选非加购商品--加价购商品不校验是否在菜单，不调用validateShopProduct
+        List<CartGoods> checkGoods = cartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType() != GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType()).collect(Collectors.toList());
+        CheckCartRequest checkCartRequest = null;
+        if (CollectionUtils.isNotEmpty(checkGoods)) {
+            //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
+            checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
+                    storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
+        }
+        return checkCartRequest;
+    }
+
     private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> getCoupon(String couponCode, String activityCode, List<CartGoods> cartGoodsList) {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -115,7 +115,13 @@ public class CalculationServiceImpl {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         for (CartGoods cartGoods : cartGoodsList) {
-            addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getCustomerCode(),cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice(), cartGoods.getMemberDiscount(),cartGoods);
+            addCalculationDiscountGoods(calculationDiscountGoodsList,
+                    StringUtils.isNotEmpty(cartGoods.getCustomerCode()) ? cartGoods.getCustomerCode() : "",
+                    StringUtils.isNotEmpty(cartGoods.getGoodsId()) ? cartGoods.getGoodsId() : "",
+                    null != cartGoods.getQty() ? cartGoods.getQty() : 0 ,
+                    null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() : 0,
+                    null != cartGoods.getMemberDiscount() ? cartGoods.getMemberDiscount() : 0,
+                    cartGoods);
         }
 
         // 当加价购商品不为空时
@@ -404,9 +410,9 @@ public class CalculationServiceImpl {
         long totalPackgeAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
-            long originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();
-            long amount = cartGoods.getOriginalPrice() * cartGoods.getQty();
-            long packAmount = cartGoods.getPackPrice() * cartGoods.getQty();
+            long originalAmount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long amount =  null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long packAmount =  null != cartGoods.getPackPrice() ? cartGoods.getPackPrice() : 0;
             totalOriginalAmount += originalAmount;
             totalAmount += amount;
             totalPackgeAmount += packAmount;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -326,21 +326,28 @@ public class CouponDiscountCalculation {
     }
 
 
-    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods){
+    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods,String moneyCoupon){
         List<CouponAvailableReq> resList = new ArrayList<>();
         CouponAvailableReq res = new CouponAvailableReq();
         res.setProviderId(requestVo.getPartnerId());
         res.setMerchantId(requestVo.getPartnerId());
         res.setStoreId(requestVo.getStoreId());
-        List<String> couponList = new ArrayList<>();
         res.setChannelIdList(commonService.getOrgCodes(requestVo.getPartnerId(), requestVo.getStoreId()));
         List<CouponProductVo> productList = new ArrayList<>();
+        res.setCouponCodes(StringUtils.isNotEmpty(moneyCoupon) ? Arrays.asList(moneyCoupon) :null);
         if (CollectionUtils.isNotEmpty(cartGoods)) {
             cartGoods.forEach(cartGood -> {
                 if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
-                    couponList.add(cartGood.getCouponCode());
-                    res.setCouponCodes(couponList);
+                    CouponProductVo couponProductVo = new CouponProductVo();
+                    couponProductVo.setAmount(cartGood.getAmount().intValue());
+                    couponProductVo.setKeyProductCode(cartGood.getCustomerCode());
+                    couponProductVo.setQuantity(cartGood.getQty());
+                    couponProductVo.setProductId(cartGood.getGoodsId());
+                    couponProductVo.setCouponCode(cartGood.getCouponCode());
+                    couponProductVo.setCategoryCode(null);
+                    productList.add(couponProductVo);
                 }
+
                 if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
                     cartGood.getProductComboList().forEach(comboxGoods -> {
                         CouponProductVo couponProductVo = new CouponProductVo();
@@ -370,8 +377,7 @@ public class CouponDiscountCalculation {
             resList.add(res);
         }
         return resList;
-        }
-
+    }
 
 
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -58,6 +58,7 @@ public class TimeSaleCalculation {
         Map<String, Integer> numberMap = new HashMap<>();
         List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(),ActivityTypeEnum.TYPE_23.getCode());
         for (CartGoods cartGoods : cartGoodsList) {
+            cartGoods.setOriginalPrice( null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0);
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;
             if ((goods = goodsMap.get(cartGoods.getGoodsId())) == null) {
                 continue;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponProductVo.java

@@ -22,6 +22,6 @@ public class CouponProductVo {
     private String productId;
     private Integer amount;
     private Integer quantity;
-
+    private String couponCode;
     private String categoryCode;
 }