ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit bdb6f1efad0c9d32b3e3043466dcaff0c346316f 1 parent 5b87d86a

rename

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
@@ -21,8 +21,8 @@ public class InviteSettlementItemListVO { @@ -21,8 +21,8 @@ public class InviteSettlementItemListVO {
21 int totalElements; 21 int totalElements;
22 String totalOrderAmount; 22 String totalOrderAmount;
23 String totalSettleAmount; 23 String totalSettleAmount;
24 - String paidAmount;  
25 - String waitPayAmount; 24 + String totalPaidAmount;
  25 + String totalWaitPayAmount;
26 List<InviteSettlementItemVO> list; 26 List<InviteSettlementItemVO> list;
27 27
28 @Data 28 @Data
@@ -100,12 +100,12 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -100,12 +100,12 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
100 .pageSize(limit) 100 .pageSize(limit)
101 .pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1)) 101 .pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1))
102 .totalElements(totalElements) 102 .totalElements(totalElements)
103 - .totalOrderAmount(formatAmount(totalOrderAmount))  
104 - .totalSettleAmount(formatAmount(totalSettleAmount)); 103 + .totalOrderAmount(formatAmount("￥%s", totalOrderAmount))
  104 + .totalSettleAmount(formatAmount("￥%s", totalSettleAmount));
105 if (totalElements == 0) { 105 if (totalElements == 0) {
106 return builder 106 return builder
107 - .paidAmount(formatAmount(BigDecimal.ZERO))  
108 - .waitPayAmount(formatAmount(BigDecimal.ZERO)) 107 + .totalPaidAmount(formatAmount("￥%s", BigDecimal.ZERO))
  108 + .totalWaitPayAmount(formatAmount("￥%s", BigDecimal.ZERO))
109 .list(Lists.newArrayList()) 109 .list(Lists.newArrayList())
110 .build(); 110 .build();
111 } 111 }
@@ -124,11 +124,11 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -124,11 +124,11 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
124 }; 124 };
125 125
126 return builder 126 return builder
127 - .paidAmount(formatAmount(list.stream() 127 + .totalPaidAmount(formatAmount("￥%s", list.stream()
128 .filter(itemHasPaid) 128 .filter(itemHasPaid)
129 .map(InviteSettlementItem::getSettleAmount) 129 .map(InviteSettlementItem::getSettleAmount)
130 .reduce(BigDecimal.ZERO, BigDecimal::add))) 130 .reduce(BigDecimal.ZERO, BigDecimal::add)))
131 - .waitPayAmount(formatAmount(list.stream() 131 + .totalWaitPayAmount(formatAmount("￥%s", list.stream()
132 .filter(itemHasPaid.negate()) 132 .filter(itemHasPaid.negate())
133 .map(InviteSettlementItem::getSettleAmount) 133 .map(InviteSettlementItem::getSettleAmount)
134 .reduce(BigDecimal.ZERO, BigDecimal::add))) 134 .reduce(BigDecimal.ZERO, BigDecimal::add)))