商城门店非必传

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

@@ -17,7 +17,6 @@ public class OrderAffirmRequestVO {
     /**
      * 门店id
      */
-    @NotEmpty(message = "门店id不能为空")
     private String shopId;
 
     /**

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

@@ -153,7 +153,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         baseQueryOrderRequest.setTrackingNo(trackingNo);
         QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
         // 判断订单信息是否存在
-        BaseResponse baseResponse = this.checkOrder(response, requestVO.getPartnerId(), requestVO.getShopId());
+        BaseResponse baseResponse = this.checkOrder(response, requestVO.getPartnerId());
         if (baseResponse != null) {
             return baseResponse;
         }
@@ -204,9 +204,6 @@ public class MallOrderServiceImpl implements MallOrderService {
         if(StringUtils.isEmpty(createOrderVo.getSessionId())){
             return ResponseUtil.error(ResponseResult.CREATE_ORDER_CHECK_SESSION_ERROR);
         }
-        if(StringUtils.isEmpty(createOrderVo.getShopId())){
-            return ResponseUtil.error(ResponseResult.CREATE_ORDER_CHECK_STORE_ERROR);
-        }
         return ResponseUtil.success();
     }
 
@@ -677,7 +674,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         }
     }
 
-    private BaseResponse checkOrder(QueryOrderByIdResponse response, String partnerId, String storeId) {
+    private BaseResponse checkOrder(QueryOrderByIdResponse response, String partnerId) {
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
         }

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

@@ -16,8 +16,9 @@ public class BaseRequestVo {
     private String partnerId;
     /**
      * 门店Id
+     * 商城没有门店id，如果需要门店id必传在业务中进行校验
      */
-    @NotEmpty(message = "shopId不能为空")
+    //@NotEmpty(message = "shopId不能为空")
     private String shopId;
 
     /**

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

@@ -320,13 +320,8 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartClearRequestVo.getPartnerId();
-        String storeId = shoppingCartClearRequestVo.getShopId();
-        /**
-         * 支付成功回调 传的门店id就是商城的门店id,其他传的是点餐门店id
-         */
-        if (!ObjectUtils.equals(shoppingCartClearRequestVo.getOperationType(), OperationTypeEnum.PAY_SUCCESS.getOperationType())) {
-            storeId = this.getBindMallShopId(appId);
-        }
+        String storeId = this.getBindMallShopId(appId);
+        shoppingCartClearRequestVo.setShopId(storeId);
 
         // 构造请求参数，进行清空购物车
         com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, storeId, userId);
@@ -359,7 +354,8 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String appId = shoppingCartInfoRequestVo.getAppId();
-        String storeId = shoppingCartInfoRequestVo.getShopId();
+        String storeId = this.getBindMallShopId(appId);
+        shoppingCartInfoRequestVo.setShopId(storeId);
 
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();