ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 2d993cb66ffaf6956e17834e3af7fee1c0b9c0f2 1 parent a3e483be

fixbug

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -40,7 +40,7 @@ public interface TradeBillsMapper { @@ -40,7 +40,7 @@ public interface TradeBillsMapper {
40 List<TradeBills> selectForAssetsDetailsView(@Param("uid") Integer uid, @Param("queryType") Integer queryType, @Param("start") Integer start, @Param("limit") Integer limit); 40 List<TradeBills> selectForAssetsDetailsView(@Param("uid") Integer uid, @Param("queryType") Integer queryType, @Param("start") Integer start, @Param("limit") Integer limit);
41 41
42 //根据用户uid，获取用户总收入 42 //根据用户uid，获取用户总收入
43 - List<AssetsDetailsViewIncomeAmount> selectIncomeAmountForAssetsDetailsView(@Param("uid") Integer uid); 43 + List<AssetsDetailsViewIncomeAmount> selectIncomeAmountForAssetsDetailsView(@Param("uid") Integer uid, @Param("queryType") Integer queryType);
44 44
45 45
46 } 46 }
@@ -118,7 +118,7 @@ public class AssetsService { @@ -118,7 +118,7 @@ public class AssetsService {
118 TradeBillsSummaryBo summary(int uid) { 118 TradeBillsSummaryBo summary(int uid) {
119 return assetsDetailsViewCache.summary(AssetsDetailsViewRequest.builder().uid(uid).build(), request -> { 119 return assetsDetailsViewCache.summary(AssetsDetailsViewRequest.builder().uid(uid).build(), request -> {
120 log.info("{} load summary", request.getUid()); 120 log.info("{} load summary", request.getUid());
121 - List<AssetsDetailsViewIncomeAmount> incomeAmounts = tradeBillsMapper.selectIncomeAmountForAssetsDetailsView(request.getUid()); 121 + List<AssetsDetailsViewIncomeAmount> incomeAmounts = tradeBillsMapper.selectIncomeAmountForAssetsDetailsView(request.getUid(),null);
122 log.info("{} load summary found {} items", request.getUid(), incomeAmounts.size()); 122 log.info("{} load summary found {} items", request.getUid(), incomeAmounts.size());
123 BigDecimal goodsIncome = incomeAmounts.stream() 123 BigDecimal goodsIncome = incomeAmounts.stream()
124 .filter(e -> TradeType.goods_income.getCode() == e.getTradeType().intValue()) 124 .filter(e -> TradeType.goods_income.getCode() == e.getTradeType().intValue())