|
|
@@ -7,9 +7,11 @@ import org.jeecg.common.util.businessAccountUtils;
|
|
|
import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccount;
|
|
|
import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccountDetail;
|
|
|
import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccountDetailExport;
|
|
|
+import org.jeecg.modules.hlgcpmanager.entity.HlgCpSetting;
|
|
|
import org.jeecg.modules.hlgcpmanager.mapper.HlgCpAccountDetailMapper;
|
|
|
import org.jeecg.modules.hlgcpmanager.service.IHlgCpAccountDetailService;
|
|
|
import org.jeecg.modules.hlgcpmanager.service.IHlgCpAccountService;
|
|
|
+import org.jeecg.modules.hlgcpmanager.service.IHlgCpSettingService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -25,6 +27,8 @@ import java.util.List;
|
|
|
public class HlgCpAccountDetailServiceImpl extends ServiceImpl<HlgCpAccountDetailMapper, HlgCpAccountDetail> implements IHlgCpAccountDetailService {
|
|
|
@Autowired
|
|
|
private IHlgCpAccountService hlgCpAccountService;
|
|
|
+ @Autowired
|
|
|
+ private IHlgCpSettingService hlgCpSettingService;
|
|
|
|
|
|
@Override
|
|
|
public HlgCpAccountDetail getByAccountDetailId(Integer id) {
|
|
|
@@ -123,7 +127,9 @@ public class HlgCpAccountDetailServiceImpl extends ServiceImpl<HlgCpAccountDetai
|
|
|
}
|
|
|
hlgCpAccount.setBalanceMoney(balanceMoney);
|
|
|
hlgCpAccount.setServiceFeeBalanceMoney(serviceFeeBalanceMoney);
|
|
|
- hlgCpAccount.setCpCompanyName(hlgCpAccountList.get(0).getCpCompanyName());
|
|
|
+ //中间服务商
|
|
|
+ HlgCpSetting hlgCpSetting = hlgCpSettingService.findHlgCpSetting();
|
|
|
+ hlgCpAccount.setCpCompanyName(hlgCpSetting.getCompanyName());
|
|
|
return hlgCpAccount;
|
|
|
}
|
|
|
|