Merge branch 'feature/1.9.24-fix-mall-20200522-dingkai'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -855,9 +855,9 @@ public class OrderAdapter {
         }
 
         if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
-            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
-            queryOrdersDto.setStatus(statuses);
-            queryOrdersDto.setType(new Integer[]{});
+//            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
+//            queryOrdersDto.setStatus(statuses);
+//            queryOrdersDto.setType(new Integer[]{});
         }
 
         return queryOrdersDto;

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

@@ -170,8 +170,7 @@ public class CheckMallOrder {
         requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
         cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, apportionResponse.getCode())) {
-            ResponseResult responseResult = ResponseResult.getResponseResult(apportionResponse.getCode());
-            throw new ServiceException(responseResult != null ? responseResult : ResponseResult.SHOPPING_CART_GETINFO_ERROR );
+            throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_ERROR);
         }
         if (apportionResponse.getResult() == null || CollectionUtils.isEmpty(apportionResponse.getResult().getProducts())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);

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

@@ -325,8 +325,11 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartClearRequestVo.getPartnerId();
-        String storeId = this.getBindMallShopId(appId);
-        shoppingCartClearRequestVo.setShopId(storeId);
+        String storeId = shoppingCartClearRequestVo.getShopId();
+        if(Objects.equals(shoppingCartClearRequestVo.getOperationType(), OperationTypeEnum.PAY_SUCCESS.getOperationType())) {
+            storeId = this.getBindMallShopId(appId);
+            shoppingCartClearRequestVo.setShopId(storeId);
+        }
 
         // 构造请求参数，进行清空购物车
         com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, storeId, userId);
@@ -359,8 +362,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String appId = shoppingCartInfoRequestVo.getAppId();
-        String storeId = this.getBindMallShopId(appId);
-        shoppingCartInfoRequestVo.setShopId(storeId);
+        String storeId = shoppingCartInfoRequestVo.getShopId();
 
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();