Authored by LUOXC

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

... ... @@ -19,7 +19,6 @@ public class InviteSettlementItemListVO {
int pageTotal;
int pageSize;
int totalElements;
String totalOrderAmount;
String totalSettleAmount;
String totalPaidAmount;
String totalWaitPayAmount;
... ...
... ... @@ -99,7 +99,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight());
int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements();
BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount();
InviteSettlementItemStats statsAll;
if (tab != 0) {
statsAll = inviteSettlementItemMapper.selectStats(uid, getStatusList(0), settlementType, time.getLeft(), time.getRight());
... ... @@ -114,7 +113,6 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
.pageSize(limit)
.pageTotal((totalElements % limit == 0) ? (totalElements / limit) : (totalElements / limit + 1))
.totalElements(totalElements)
.totalOrderAmount(formatAmount("¥%s", totalOrderAmount))
.totalSettleAmount(formatAmount("¥%s", totalSettleAmount))
.totalPaidAmount(formatAmount("¥%s", totalPaidAmount))
.totalWaitPayAmount(formatAmount("¥%s", totalWaitPayAmount));
... ...