ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 12d5fd4406a0364af407713c41feff1ccb43ca81 2 parents cb68dc6b 984a3f7d

Merge branch 'hotfix-invite-activity' into test6.9.0

Inline Side-by-side
Showing 2 changed files with 0 additions and 3 deletions
@@ -19,7 +19,6 @@ public class InviteSettlementItemListVO { @@ -19,7 +19,6 @@ public class InviteSettlementItemListVO {
19 int pageTotal; 19 int pageTotal;
20 int pageSize; 20 int pageSize;
21 int totalElements; 21 int totalElements;
22 - String totalOrderAmount;  
23 String totalSettleAmount; 22 String totalSettleAmount;
24 String totalPaidAmount; 23 String totalPaidAmount;
25 String totalWaitPayAmount; 24 String totalWaitPayAmount;
@@ -99,7 +99,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -99,7 +99,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
99 99
100 InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight()); 100 InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight());
101 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements(); 101 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements();
102 - BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount();  
103 InviteSettlementItemStats statsAll; 102 InviteSettlementItemStats statsAll;
104 if (tab != 0) { 103 if (tab != 0) {
105 statsAll = inviteSettlementItemMapper.selectStats(uid, getStatusList(0), settlementType, time.getLeft(), time.getRight()); 104 statsAll = inviteSettlementItemMapper.selectStats(uid, getStatusList(0), settlementType, time.getLeft(), time.getRight());
@@ -114,7 +113,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -114,7 +113,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
114 .pageSize(limit) 113 .pageSize(limit)
115 .pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1)) 114 .pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1))
116 .totalElements(totalElements) 115 .totalElements(totalElements)
117 - .totalOrderAmount(formatAmount("￥%s", totalOrderAmount))  
118 .totalSettleAmount(formatAmount("￥%s", totalSettleAmount)) 116 .totalSettleAmount(formatAmount("￥%s", totalSettleAmount))
119 .totalPaidAmount(formatAmount("￥%s", totalPaidAmount)) 117 .totalPaidAmount(formatAmount("￥%s", totalPaidAmount))
120 .totalWaitPayAmount(formatAmount("￥%s", totalWaitPayAmount)); 118 .totalWaitPayAmount(formatAmount("￥%s", totalWaitPayAmount));