修复购物车数量异常问题

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/CurrentCompanyWechat.java

@@ -45,4 +45,6 @@ public class CurrentCompanyWechat extends AdminCompanyWechat{
 
     @ApiModelProperty("培训文件夹id")
     private String trainingFolderId;
+    @ApiModelProperty("当前仓库id")
+    private String currentStorageId;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -120,6 +120,7 @@ public class CommonLogic {
 
         currentCompanyWechat.setCurrentCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
         currentCompanyWechat.setCurrentCompanyName(currentCompanyWechat.getCompanyName());
+        currentCompanyWechat.setCurrentStorageId(storageId);
 
         if (StringUtils.isNotBlank(token) && !token.equals("1111")) {
             Object result = redisUtil.get(Constant.RedisPrefix.TOKEN_APP_USER + token);

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/ShoppingCartLogic.java

@@ -146,7 +146,7 @@ public class ShoppingCartLogic {
         User user = userService.getById(userId);
 
         List<BuyGood> buyGoods = shoppingCartBean.getBuyGoods();
-        if(buyGoods == null || buyGoods.size() == 0 || buyGoods .size() > 1){
+        if(buyGoods == null || buyGoods.size() != 1){
             return null;
         }
         BuyGood buyGood = buyGoods.get(0);

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -510,7 +510,7 @@ public class UserLogic {
         }
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
-        userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId(), null));
+        userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId(), currentCompanyWechat.getCurrentStorageId()));
         userWxBean.setCompanyWechatMobile(currentCompanyWechat.getLinkPhone());
         userWxBean.setModuleMaterialPart(currentCompanyWechat.getModuleMaterialPart());
         userWxBean.setModuleWb(currentCompanyWechat.getModuleWb());

mall-miniapp-service/src/main/resources/mapper/AppMapper.xml

@@ -22,7 +22,7 @@
         FROM shopping_cart a
                 JOIN goods_spec b ON a.goods_spec_id = b.goods_spec_id
                 JOIN goods c ON c.goods_id = a.goods_id
-                LEFT JOIN goods_material_storage d ON b.goods_code = d.goods_material_id
+                LEFT JOIN goods_material_storage d ON b.goods_code = d.goods_material_id AND a.storage_id = d.storage_id
                 LEFT JOIN goods_detail e on c.goods_id = e.goods_id
         WHERE a.user_id = #{userId}
         <if test="storageId != null and storageId != ''">