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

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);