From 09b631436fbb532772862e3893c9513bf0e4a8f6 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 2 Jul 2025 16:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=94=BE=E5=BF=83?= =?UTF-8?q?=E7=AD=BE=E7=9A=84=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa/admin/extend/fangxinqian/Base.java | 3 +- .../extend/fangxinqian/task/FxqTask.java | 1 - .../controller/ExpertFxqController.java | 8 ++- .../app/expert/service/ExpertFxqService.java | 68 +++++++++---------- .../domain/vo/CaseplatformCaseVO.java | 2 +- .../CaseplatformCaseMapper.xml | 5 +- 6 files changed, 45 insertions(+), 42 deletions(-) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Base.java b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Base.java index 0c763f3..152429a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Base.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Base.java @@ -45,7 +45,6 @@ public class Base { public String postJson(String url, String jsonData, Map headers) { // 获取token String tokenKey = "fangxinqian:" + clientId; -// redisTemplate.delete(tokenKey); String token = redisTemplate.opsForValue().get(tokenKey); if (token == null) { token = getAccessToken(); @@ -55,7 +54,7 @@ public class Base { HttpRequest request = HttpRequest.post(url) .body(jsonData) .header("Content-Type", "application/json") - .header("Authorization", "Bearer " + token); + .header("Authorization", String.format("Bearer %s",token)); if (headers != null) { headers.forEach(request::header); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/FxqTask.java b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/FxqTask.java index 95b6be1..4f76eec 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/FxqTask.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/FxqTask.java @@ -23,7 +23,6 @@ public class FxqTask extends Base { requestData.put("unionId", unionId); // 个人/企业主体在放心签平台与接入方关联的唯一性标识（发起方账号） String jsonBody = JSONUtil.toJsonStr(requestData); - log.info("获取app数据参数:{}",jsonBody); String response = postJson(url,jsonBody,null); GetTemplateListResponse result = JSONUtil.toBean(response, GetTemplateListResponse.class); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java index ff087bb..cb3af1b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertFxqController.java @@ -158,9 +158,11 @@ public class ExpertFxqController { // 签署任务详情查询 FxqExpertTaskEntity fxqExpertTask = expertFxqService.getTaskDetail(expertId); - if (Objects.equals(fxqExpertTask.getTaskStatus(), "20")) { - // 已签署 - return ResponseDTO.userErrorParam("您已签订协议，无需再次签订"); + if (fxqExpertTask != null) { + if (Objects.equals(fxqExpertTask.getTaskStatus(), "20")) { + // 已签署 + return ResponseDTO.userErrorParam("您已签订协议，无需再次签订"); + } } // 获取签署的模版数据 diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java index 544b501..d22f011 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java @@ -298,6 +298,17 @@ public class ExpertFxqService { @Transactional public AddFxqVo addTemplateTask(FxqCompanyEntity company, FxqUserEntity fxqUser, FxqTemplateEntity fxqTemplate,ExpertEntity expert){ try { + // 授权处理 + if (company.getAuthStatus() == 1){ + if (company.getAuthExpireDate() != null && company.getAuthExpireDate().isBefore(LocalDateTime.now())) { + // 已授权但已过期 + throw new BusinessException("操作失败:请联系客服人员更换授权"); + } + }else{ + // 未授权 + throw new BusinessException("操作失败:请联系客服人员更换授权"); + } + // 需创建模版任务 AddTemplateTaskRequest r = new AddTemplateTaskRequest(); r.setUnionId(company.getUnionId()); @@ -318,28 +329,28 @@ public class ExpertFxqService { r.setSigners(signersList); - // 初始化 components 列表 - List componentsList = new ArrayList<>(); - - // 乙方姓名 - AddTemplateTaskRequest.componentsData name = new AddTemplateTaskRequest.componentsData(); - name.setFileKey("name"); - name.setFileValue(fxqUser.getName()); - componentsList.add(name); - - // 乙方工作单位 - AddTemplateTaskRequest.componentsData work = new AddTemplateTaskRequest.componentsData(); - work.setFileKey("work"); - work.setFileValue(expert.getHospitalName()); - componentsList.add(work); - - // 乙方联系电话 - AddTemplateTaskRequest.componentsData mobile = new AddTemplateTaskRequest.componentsData(); - mobile.setFileKey("mobile"); - mobile.setFileValue(expert.getMobile()); - componentsList.add(mobile); - - r.setComponents(componentsList); +// // 初始化 components 列表 +// List componentsList = new ArrayList<>(); +// +// // 乙方姓名 +// AddTemplateTaskRequest.componentsData name = new AddTemplateTaskRequest.componentsData(); +// name.setFileKey("name"); +// name.setFileValue(fxqUser.getName()); +// componentsList.add(name); +// +// // 乙方工作单位 +// AddTemplateTaskRequest.componentsData work = new AddTemplateTaskRequest.componentsData(); +// work.setFileKey("work"); +// work.setFileValue(expert.getHospitalName()); +// componentsList.add(work); +// +// // 乙方联系电话 +// AddTemplateTaskRequest.componentsData mobile = new AddTemplateTaskRequest.componentsData(); +// mobile.setFileKey("mobile"); +// mobile.setFileValue(expert.getMobile()); +// componentsList.add(mobile); +// +// r.setComponents(componentsList); AddTemplateTaskResponse templateTask = fxqTask.addTemplateTask(r); if (templateTask.getData() == null) { @@ -350,17 +361,6 @@ public class ExpertFxqService { throw new BusinessException("操作失败"); } - // 授权处理 - if (company.getAuthStatus() == 1){ - if (company.getAuthExpireDate() != null && company.getAuthExpireDate().isBefore(LocalDateTime.now())) { - // 已授权但已过期 - throw new BusinessException("操作失败:请联系客服人员更换授权"); - } - }else{ - // 未授权 - throw new BusinessException("操作失败:请联系客服人员更换授权"); - } - // 获取签署链接 GetTaskLinkResponse.taskDetailsData fxqLink = getTaskLink(templateTask.getData().getTaskNo(),fxqUser.getUnionId()); if (fxqLink == null) { @@ -456,7 +456,7 @@ public class ExpertFxqService { // 修改专家签署任务表 if (taskLink.getData().getTaskStatus() == 20){ - int rows = fxqSignDao.updateSignStatus(fxqExpertTask.getExpertId(), taskId,2); + int rows = fxqSignDao.updateSignStatus(fxqExpertTask.getExpertId(), taskId,1); if (rows == 0) { throw new BusinessException("更新失败，未找到符合条件的记录"); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java index 335d257..7764d5a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java @@ -72,7 +72,7 @@ public class CaseplatformCaseVO { private String signStatus; @ApiModelProperty(value = "协议地址") - private String taskLink; + private String signLink; @ApiModelProperty(value = "签署完成时间") private LocalDateTime signTime; diff --git a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml index bc47a83..a7255cc 100644 --- a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml @@ -9,10 +9,13 @@ t_caseplatform_expert.name expertName, (select name from t_area where id=t_caseplatform_expert.prov_id) expertProvName, (select name from t_area where id=t_caseplatform_expert.city_id) expertCityName, - t_caseplatform_expert.hospital_name expertHospitalName + t_caseplatform_expert.hospital_name expertHospitalName, + t_caseplatform_fxq_sign.sign_status signStatus, + t_caseplatform_fxq_sign.sign_link signLink FROM t_caseplatform_case left join t_caseplatform_user on t_caseplatform_case.user_id = t_caseplatform_user.id left join t_caseplatform_expert on t_caseplatform_case.expert_id = t_caseplatform_expert.id + left join t_caseplatform_fxq_sign on t_caseplatform_fxq_sign.expert_id = t_caseplatform_expert.id