ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit b26d45d618f06fafed04546c07e00964b8e66855 2 parents c152d5c8 bdb6f1ef

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

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
... ... @@ -21,8 +21,8 @@ public class InviteSettlementItemListVO {
int totalElements;
String totalOrderAmount;
String totalSettleAmount;
String paidAmount;
String waitPayAmount;
String totalPaidAmount;
String totalWaitPayAmount;
List<InviteSettlementItemVO> list;
@Data
... ...
... ... @@ -100,12 +100,12 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
.pageSize(limit)
.pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1))
.totalElements(totalElements)
.totalOrderAmount(formatAmount(totalOrderAmount))
.totalSettleAmount(formatAmount(totalSettleAmount));
.totalOrderAmount(formatAmount("￥%s", totalOrderAmount))
.totalSettleAmount(formatAmount("￥%s", totalSettleAmount));
if (totalElements == 0) {
return builder
.paidAmount(formatAmount(BigDecimal.ZERO))
.waitPayAmount(formatAmount(BigDecimal.ZERO))
.totalPaidAmount(formatAmount("￥%s", BigDecimal.ZERO))
.totalWaitPayAmount(formatAmount("￥%s", BigDecimal.ZERO))
.list(Lists.newArrayList())
.build();
}
... ... @@ -124,11 +124,11 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
};
return builder
.paidAmount(formatAmount(list.stream()
.totalPaidAmount(formatAmount("￥%s", list.stream()
.filter(itemHasPaid)
.map(InviteSettlementItem::getSettleAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add)))
.waitPayAmount(formatAmount(list.stream()
.totalWaitPayAmount(formatAmount("￥%s", list.stream()
.filter(itemHasPaid.negate())
.map(InviteSettlementItem::getSettleAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add)))
... ...