|
@@ -315,19 +315,23 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
userIds.add(sysUserAccount.getUserId());
|
|
userIds.add(sysUserAccount.getUserId());
|
|
|
BigDecimal ssKTAmount = sysUserAccount.getSumAmount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmount();
|
|
BigDecimal ssKTAmount = sysUserAccount.getSumAmount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmount();
|
|
|
ssKTAmountSum = ssKTAmountSum.add(ssKTAmount);
|
|
ssKTAmountSum = ssKTAmountSum.add(ssKTAmount);
|
|
|
- sumDocumentary = sumDocumentary.add(sysUserAccount.getDocumentary());
|
|
|
|
|
|
|
+// sumDocumentary = sumDocumentary.add(sysUserAccount.getDocumentary());
|
|
|
}
|
|
}
|
|
|
if(!dxUserIds.isEmpty()) {
|
|
if(!dxUserIds.isEmpty()) {
|
|
|
userIds.addAll(insFeeOrderNewService.findDxUserIds(dxUserIds));
|
|
userIds.addAll(insFeeOrderNewService.findDxUserIds(dxUserIds));
|
|
|
}
|
|
}
|
|
|
ysTXAmountSum = insFeeOrderNewService.findSumAmountYTXmount(userIds,"3");
|
|
ysTXAmountSum = insFeeOrderNewService.findSumAmountYTXmount(userIds,"3");
|
|
|
txzTXAmountSum = insFeeOrderNewService.findSumAmountYTXmount(userIds, "2");
|
|
txzTXAmountSum = insFeeOrderNewService.findSumAmountYTXmount(userIds, "2");
|
|
|
- sumAmountSum = ysTXAmountSum.add(ssKTAmountSum).add(txzTXAmountSum);
|
|
|
|
|
|
|
+ sumDocumentary = sumDocumentary.add(ysTXAmountSum.add(ssKTAmountSum).add(txzTXAmountSum));
|
|
|
|
|
+ sumAmountSum = sumAmountSum.add(ssKTAmountSum);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ //可提现
|
|
|
sumAccount.setSumAmountWithdrawal(sumAmountSum);
|
|
sumAccount.setSumAmountWithdrawal(sumAmountSum);
|
|
|
|
|
+ // 已提现金额
|
|
|
sumAccount.setSumAmountAccount(ysTXAmountSum);
|
|
sumAccount.setSumAmountAccount(ysTXAmountSum);
|
|
|
|
|
+ // 支付中的金额
|
|
|
sumAccount.setSumAmountPayment(txzTXAmountSum);
|
|
sumAccount.setSumAmountPayment(txzTXAmountSum);
|
|
|
|
|
+ // 总金额
|
|
|
sumAccount.setDocumentary(sumDocumentary);
|
|
sumAccount.setDocumentary(sumDocumentary);
|
|
|
}
|
|
}
|
|
|
return sumAccount;
|
|
return sumAccount;
|