Authored by LUOXC

fixbug

... ... @@ -40,7 +40,7 @@ public interface TradeBillsMapper {
List<TradeBills> selectForAssetsDetailsView(@Param("uid") Integer uid, @Param("queryType") Integer queryType, @Param("start") Integer start, @Param("limit") Integer limit);
//根据用户uid,获取用户总收入
List<AssetsDetailsViewIncomeAmount> selectIncomeAmountForAssetsDetailsView(@Param("uid") Integer uid);
List<AssetsDetailsViewIncomeAmount> selectIncomeAmountForAssetsDetailsView(@Param("uid") Integer uid, @Param("queryType") Integer queryType);
}
... ...
... ... @@ -118,7 +118,7 @@ public class AssetsService {
TradeBillsSummaryBo summary(int uid) {
return assetsDetailsViewCache.summary(AssetsDetailsViewRequest.builder().uid(uid).build(), request -> {
log.info("{} load summary", request.getUid());
List<AssetsDetailsViewIncomeAmount> incomeAmounts = tradeBillsMapper.selectIncomeAmountForAssetsDetailsView(request.getUid());
List<AssetsDetailsViewIncomeAmount> incomeAmounts = tradeBillsMapper.selectIncomeAmountForAssetsDetailsView(request.getUid(),null);
log.info("{} load summary found {} items", request.getUid(), incomeAmounts.size());
BigDecimal goodsIncome = incomeAmounts.stream()
.filter(e -> TradeType.goods_income.getCode() == e.getTradeType().intValue())
... ...