diff --git a/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/DashboardService.java b/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/DashboardService.java index 7d62ed5..586f60e 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/DashboardService.java +++ b/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/DashboardService.java @@ -31,4 +31,6 @@ public interface DashboardService { CommonRespVO getWarnRespList(String type, Long pageNum, Long pageSize); CommonRespVO getTagList(String custId); + + CommonRespVO getTaskDetail(String custId); } diff --git a/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/impl/DashboardServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/impl/DashboardServiceImpl.java index 9c36626..2a38057 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/impl/DashboardServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/dashboard/service/impl/DashboardServiceImpl.java @@ -271,6 +271,44 @@ public class DashboardServiceImpl implements DashboardService { return respVO; } + /** + * 获取催收任务详情--青田 + * + * @return + */ + @Override + public CommonRespVO getTaskDetail(String custId) { + CommonRespVO respVO = new CommonRespVO(); + UrlRegistry urlRegistry = urlRegistryMapper.selectUrlByCondition(SecurityUtils.getHeadId(), "2", "催收信息"); + if (urlRegistry == null || urlRegistry.getUrlPath() == null) { + log.warn("未配置催收信息接口URL, headId: {}", SecurityUtils.getHeadId()); + return respVO; + } + String processedCustId = custId.length() > 3 ? custId.substring(3) : custId; + Map paramMap = new HashMap<>(); + paramMap.put("csno", processedCustId); + String paramJson = JSON.toJSONString(paramMap); + + try { + String authToken = getAuthToken(); + String resp = HttpUtils.doPost(urlRegistry.getUrlPath(), paramJson, authToken); + respVO = resp2VO(resp); + } catch (Exception e) { + log.error("请求催收信息异常: " + e.getMessage()); + redisCache.deleteObject(REDIS_KEY_TOKEN + SecurityUtils.getUsername()); + String newToken = getAuthToken(); + log.info("已刷新token, 重试请求, token: " + newToken); + try { + String resp = HttpUtils.doPost(urlRegistry.getUrlPath(), paramJson, newToken); + respVO = resp2VO(resp); + } catch (Exception ex) { + log.error("重试请求仍然失败: " + ex.getMessage()); + } + } + return respVO; + } + + /** * 获取token--青田 * diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoBusinessVo.java b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoBusinessVo.java index 67ae04d..29b9593 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoBusinessVo.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoBusinessVo.java @@ -35,6 +35,17 @@ public class CustInfoBusinessVo { private List addressDetails; + //催收任务详情--青田 + private List> taskDetail; + + public List> getTaskDetail() { + return taskDetail; + } + + public void setTaskDetail(List> taskDetail) { + this.taskDetail = taskDetail; + } + public List getAddressDetails() { return addressDetails; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoMerchantVo.java b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoMerchantVo.java index 9ac0371..a14e525 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoMerchantVo.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoMerchantVo.java @@ -36,6 +36,17 @@ public class CustInfoMerchantVo { private List addressDetails; + //催收任务详情--青田 + private List> taskDetail; + + public List> getTaskDetail() { + return taskDetail; + } + + public void setTaskDetail(List> taskDetail) { + this.taskDetail = taskDetail; + } + public List getCmpmUserLists() { return cmpmUserLists; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java index c7fc1eb..c64ec5a 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/domain/CustInfoRetailVo.java @@ -46,6 +46,17 @@ public class CustInfoRetailVo //他行利率信息 private List otherBankRates; + //催收任务详情--青田 + private List> taskDetail; + + public List> getTaskDetail() { + return taskDetail; + } + + public void setTaskDetail(List> taskDetail) { + this.taskDetail = taskDetail; + } + public String getCmpmUserName() { return cmpmUserName!=null?cmpmUserName:""; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoBusinessServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoBusinessServiceImpl.java index 00df927..e829696 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoBusinessServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoBusinessServiceImpl.java @@ -8,6 +8,8 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.ibs.custmap.domain.entity.CustInfoRadar; import com.ruoyi.ibs.custmap.mapper.CustMapMapper; import com.ruoyi.ibs.customerselect.mapper.CustInfoBusinessMapper; +import com.ruoyi.ibs.dashboard.domain.vo.CommonRespVO; +import com.ruoyi.ibs.dashboard.service.DashboardService; import com.ruoyi.ibs.grid.domain.vo.AnchorDetail; import com.ruoyi.ibs.grid.mapper.AnchorMapper; import com.ruoyi.ibs.grid.service.AnchorService; @@ -66,7 +68,8 @@ public class CustInfoBusinessServiceImpl implements ICustInfoBusinessService private AnchorMapper anchorMapper; @Resource RedisCache redisCache; - + @Autowired + private DashboardService dashboardService; @Autowired private CustMapMapper custMapMapper; /** @@ -119,6 +122,10 @@ public class CustInfoBusinessServiceImpl implements ICustInfoBusinessService if (custInfoBusiness.getSocialCreditCode()!=null){ custInfoBusinessVo.setAddressDetails(anchorMapper.selectCustAddressList(custInfoBusiness.getSocialCreditCode())); } + if (SecurityUtils.getHeadId().equals("932")){ + CommonRespVO taskDetail = dashboardService.getTaskDetail(custId); + custInfoBusinessVo.setTaskDetail(taskDetail.getData()); + } return custInfoBusinessVo; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoMerchantServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoMerchantServiceImpl.java index 8a344a7..92f1805 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoMerchantServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoMerchantServiceImpl.java @@ -5,6 +5,8 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.ibs.custmap.domain.entity.CustInfoRadar; import com.ruoyi.ibs.custmap.mapper.CustMapMapper; +import com.ruoyi.ibs.dashboard.domain.vo.CommonRespVO; +import com.ruoyi.ibs.dashboard.service.DashboardService; import com.ruoyi.ibs.grid.domain.vo.AnchorDetail; import com.ruoyi.ibs.grid.mapper.AnchorMapper; import com.ruoyi.ibs.grid.service.AnchorService; @@ -64,8 +66,8 @@ public class CustInfoMerchantServiceImpl implements ICustInfoMerchantService { private AnchorService anchorService; @Autowired private AnchorMapper anchorMapper; - - + @Autowired + private DashboardService dashboardService; @Autowired private CustMapMapper custMapMapper; @@ -119,7 +121,10 @@ public class CustInfoMerchantServiceImpl implements ICustInfoMerchantService { if (custInfoMerchant.getSocialCreditCode()!=null){ custInfoMerchantVo.setAddressDetails(anchorMapper.selectCustAddressList(custInfoMerchant.getSocialCreditCode())); } - + if (SecurityUtils.getHeadId().equals("932")){ + CommonRespVO taskDetail = dashboardService.getTaskDetail(custId); + custInfoMerchantVo.setTaskDetail(taskDetail.getData()); + } return custInfoMerchantVo; } diff --git a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java index 1783e40..3e3b0fa 100644 --- a/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java +++ b/ibs/src/main/java/com/ruoyi/ibs/list/service/impl/CustInfoRetailServiceImpl.java @@ -2,7 +2,10 @@ package com.ruoyi.ibs.list.service.impl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.ibs.customerselect.mapper.CustInfoBusinessMapper; +import com.ruoyi.ibs.dashboard.domain.vo.CommonRespVO; +import com.ruoyi.ibs.dashboard.service.DashboardService; import com.ruoyi.ibs.grid.domain.vo.AnchorDetail; import com.ruoyi.ibs.grid.mapper.AnchorMapper; import com.ruoyi.ibs.grid.service.AnchorService; @@ -59,6 +62,8 @@ public class CustInfoRetailServiceImpl implements ICustInfoRetailService { private SysIndustryMapper sysIndustryMapper; @Autowired private AnchorMapper anchorMapper; + @Autowired + private DashboardService dashboardService; /** * 查询对私客户信息 @@ -138,7 +143,10 @@ public class CustInfoRetailServiceImpl implements ICustInfoRetailService { if (custInfoRetail.getCustIdc()!=null){ custInfoRetailVo.setAddressDetails(anchorMapper.selectCustAddressList(custInfoRetail.getCustIdc())); } - + } + if (SecurityUtils.getHeadId().equals("932")){ + CommonRespVO taskDetail = dashboardService.getTaskDetail(custId); + custInfoRetailVo.setTaskDetail(taskDetail.getData()); } return custInfoRetailVo; }