Przeglądaj źródła

垫款 初版1.2优化修改

zhaoxian 2 lat temu
rodzic
commit
64aeb5beca

+ 5 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/service/impl/FinancePaymentRechargeApplicationServiceImpl.java

@@ -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.Product;
 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.IProductService;
 import cn.com.ctop.common.module.service.IProjectService;
@@ -124,7 +125,10 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
                 account.setRechargeId(recharge.getId());
                 account.setProjectId(recharge.getProjectId());
                 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.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
                 account.setRebateType(obj.getString("rebateType"));