|
@@ -134,7 +134,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
|
|
FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
|
|
account.setRechargeId(recharge.getId());
|
|
account.setRechargeId(recharge.getId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
- account.setAccountId(obj.getLong("accountId"));
|
|
|
|
|
|
+ account.setAccountId(obj.getString("accountId"));
|
|
UserAllocation allocation = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
UserAllocation allocation = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
if (!Check.isNull(allocation)) {
|
|
if (!Check.isNull(allocation)) {
|
|
account.setAccountName(allocation.getAuthName());
|
|
account.setAccountName(allocation.getAuthName());
|
|
@@ -235,7 +235,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
|
|
FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
|
|
account.setRechargeId(recharge.getId());
|
|
account.setRechargeId(recharge.getId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
- account.setAccountId(obj.getLong("accountId"));
|
|
|
|
|
|
+ account.setAccountId(obj.getString("accountId"));
|
|
UserAllocation acco = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
UserAllocation acco = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
if (!Check.isNull(acco)) {
|
|
if (!Check.isNull(acco)) {
|
|
account.setAccountName(acco.getAuthName());
|
|
account.setAccountName(acco.getAuthName());
|