|
@@ -3,6 +3,7 @@ package cn.com.ctop.finance.payment.service.impl;
|
|
import cn.com.ctop.common.module.entity.Advertiser;
|
|
import cn.com.ctop.common.module.entity.Advertiser;
|
|
import cn.com.ctop.common.module.entity.Product;
|
|
import cn.com.ctop.common.module.entity.Product;
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
|
|
+import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.service.IMessageTemplate;
|
|
import cn.com.ctop.common.module.service.IMessageTemplate;
|
|
import cn.com.ctop.common.module.service.IProductService;
|
|
import cn.com.ctop.common.module.service.IProductService;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
@@ -124,7 +125,10 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
account.setRechargeId(recharge.getId());
|
|
account.setRechargeId(recharge.getId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setAccountId(obj.getLong("accountId"));
|
|
account.setAccountId(obj.getLong("accountId"));
|
|
- account.setAccountName(userAllocationService.getByAccountId(obj.getLong("accountId")).getAuthName());
|
|
|
|
|
|
+ UserAllocation allocation = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
|
|
+ if (!Check.isNull(allocation)) {
|
|
|
|
+ account.setAccountName(allocation.getAuthName());
|
|
|
|
+ }
|
|
account.setCashAmount(obj.getBigDecimal("cashAmount"));
|
|
account.setCashAmount(obj.getBigDecimal("cashAmount"));
|
|
account.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
|
|
account.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
|
|
account.setRebateType(obj.getString("rebateType"));
|
|
account.setRebateType(obj.getString("rebateType"));
|