修改了收益支出合计因分表导致的报错

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsWarehouseMapper.xml

@@ -34,7 +34,7 @@
 
     </resultMap>
     <select id="searchList" resultType="com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO">
-        select a.id, a.user_id, a.contacts, a.warehouse_phone, a.warehouse_address, a.warehouse_no, a.status, a.province, a.city, a.area, a.warehouse_type, a.warehouse_name,
+        select a.id, a.user_id, a.contacts, a.warehouse_phone, a.warehouse_address, a.warehouse_no, a.status, a.province, a.city, a.area, a.warehouse_type, a.warehouse_name,a.brand_id,
         stock.stock_num
         from kxs_warehouse a
         left join kxs_warehouse_stock stock on a.id = stock.warehouse_id

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAmountLogServiceImpl.java

@@ -50,7 +50,8 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
     public AmountInExpendTotalVO amountInExpendTotal(String tradeMonth) {
         AmountInExpendTotalVO amountInExpendTotalVO = new AmountInExpendTotalVO();
 
-
+        //每个请求线程维护一个month数据，避免多线程数据冲突
+        MonthTableNameHandler.setData(tradeMonth);
         QueryWrapper<KxsUserAmountLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", SecurityUtils.getUser().getId());
         queryWrapper.eq("DATE_FORMAT(create_time, '%Y-%m')", tradeMonth);
@@ -69,7 +70,8 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
         queryWrapper.select("IFNULL(SUM(amount),0) AS amount");
         KxsUserAmountLog sub = baseMapper.selectOne(queryWrapper);
         amountInExpendTotalVO.setExpend(sub.getAmount());
-
+        //删除线程，避免线程污染
+        MonthTableNameHandler.removeData();
         return amountInExpendTotalVO;
     }