ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit f35cd84d126da77f5851d375c10cc03d77117083 1 parent ad9f93ca

fix bug

Inline Side-by-side
Showing 1 changed file with 13 additions and 6 deletions
@@ -96,12 +96,19 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -96,12 +96,19 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
96 List<Integer> statusList = getStatusList(tab); 96 List<Integer> statusList = getStatusList(tab);
97 // 只查询结算规则1的记录 97 // 只查询结算规则1的记录
98 int settlementType = 1; 98 int settlementType = 1;
  99 +
99 InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight()); 100 InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight());
100 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements(); 101 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements();
101 BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount(); 102 BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount();
102 - BigDecimal totalSettleAmount = Objects.isNull(stats.getTotalSettleAmount()) ? BigDecimal.ZERO : stats.getTotalSettleAmount();  
103 - BigDecimal totalPaidAmount = Objects.isNull(stats.getTotalPaidAmount()) ? BigDecimal.ZERO : stats.getTotalPaidAmount();  
104 - BigDecimal totalWaitPayAmount = Objects.isNull(stats.getTotalWaitPayAmount()) ? BigDecimal.ZERO : stats.getTotalWaitPayAmount(); 103 + InviteSettlementItemStats statsAll;
  104 + if (tab != 0) {
  105 + statsAll = inviteSettlementItemMapper.selectStats(uid, getStatusList(0), settlementType, time.getLeft(), time.getRight());
  106 + } else {
  107 + statsAll = stats;
  108 + }
  109 + BigDecimal totalSettleAmount = Objects.isNull(statsAll.getTotalSettleAmount()) ? BigDecimal.ZERO : statsAll.getTotalSettleAmount();
  110 + BigDecimal totalPaidAmount = Objects.isNull(statsAll.getTotalPaidAmount()) ? BigDecimal.ZERO : statsAll.getTotalPaidAmount();
  111 + BigDecimal totalWaitPayAmount = Objects.isNull(statsAll.getTotalWaitPayAmount()) ? BigDecimal.ZERO : statsAll.getTotalWaitPayAmount();
105 InviteSettlementItemListVO.InviteSettlementItemListVOBuilder builder = InviteSettlementItemListVO.builder(); 112 InviteSettlementItemListVO.InviteSettlementItemListVOBuilder builder = InviteSettlementItemListVO.builder();
106 builder.page(page) 113 builder.page(page)
107 .pageSize(limit) 114 .pageSize(limit)
@@ -145,13 +152,13 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -145,13 +152,13 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
145 152
146 private List<Integer> getStatusList(Integer tab) { 153 private List<Integer> getStatusList(Integer tab) {
147 if (tab == 0) { 154 if (tab == 0) {
148 - return Lists.newArrayList(1, 3, 4); 155 + return Lists.newArrayList(InviteSettlementItem.STATUS_ENABLE, InviteSettlementItem.STATUS_SETTLED, InviteSettlementItem.STATUS_PAID);
149 } 156 }
150 if (tab == 1) { 157 if (tab == 1) {
151 - return Lists.newArrayList(1, 3); 158 + return Lists.newArrayList(InviteSettlementItem.STATUS_ENABLE, InviteSettlementItem.STATUS_SETTLED);
152 } 159 }
153 if (tab == 2) { 160 if (tab == 2) {
154 - return Lists.newArrayList(4); 161 + return Lists.newArrayList(InviteSettlementItem.STATUS_PAID);
155 } 162 }
156 throwServiceException("参数不正确"); 163 throwServiceException("参数不正确");
157 return Lists.newArrayList(); 164 return Lists.newArrayList();