切换门店购物车调整

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

@@ -95,15 +95,14 @@ public class MCoffeeShoppingCartController {
 
 
     /**
-     * 切换点餐方式或者门店
+     * 切换门店购物车，校验商品或者复制原门店购物车到新门店
      */
-    @ApiAnnotation(logMessage = "switchCartGoodsCheck")
-    @PostMapping(value = "/switchCartGoodsCheck")
-    public BaseResponse switchCartGoodsCheck(@Validated @LogParams @RequestBody SwitchShoppingCartRequestVo request) {
-        return shoppingCartMCoffeeService.switchCartGoodsCheck(request);
+    @ApiAnnotation(logMessage = "switchCartGoods")
+    @PostMapping(value = "/switchCartGoods")
+    public BaseResponse switchCartGoods(@Validated @LogParams @RequestBody SwitchShoppingCartRequestVo request) {
+        return shoppingCartMCoffeeService.switchCartGoods(request);
     }
 
-
     /**
      * 再来一单
      */

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

@@ -17,8 +17,8 @@ public enum  ShoppingCartOperationType {
 
     ADD_PRODUCT_COUPON(1,"增加商品券"),
     ADD_SUPER_PRICE_GOODS(2,"增加超值加购商品"),
-    UPDATE3(3,"确认切换门店"),
-    UPDATE4(4,"切换门店校验")
+    UPDATE3(3,"切换门店校验"),
+    UPDATE4(4,"确认切换门店")
             ;
 
 

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

@@ -293,7 +293,7 @@ public class CalculationServiceImpl {
      */
     private Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, String menuType) {
         Long deliveryAmount = 0l;
-        if (StringUtils.isBlank(receiveId) && !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+        if (StringUtils.isBlank(receiveId) || !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
             return deliveryAmount;
         }
         String trackingNo = LogThreadLocal.getTrackingNo();

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

@@ -36,9 +36,11 @@ public class SwitchShoppingCartRequestVo {
     /**
      * 门店Id
      */
-    @NotEmpty(message = "shopId不能为空")
-    private String shopId;
+    @NotEmpty(message = "fromShopId不能为空")
+    private String fromShopId;
 
+    @NotEmpty(message = "toShopId不能为空")
+    private String toShopId;
     /**
      * 下单类型 CreateOrderType 外卖、到店、商城
      */
@@ -71,6 +73,11 @@ public class SwitchShoppingCartRequestVo {
     /**
      * 业务类型
      */
-    private String menuType ;
+    private String menuType;
+
+    /**
+     * 操作类型 ShoppingCartOperationType　枚举
+     */
+    private Integer operationType;
 
 }