From 2a9e3672f9cb1a6bd3b407ab74a3fe3b02a1f36f Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Mon, 19 Jun 2023 10:29:21 +0800 Subject: [PATCH 01/11] miniProgramJsCodeSession --- .../coolstore-partner-service.iml | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/coolstore-partner-service.iml b/coolstore-partner-service/coolstore-partner-service.iml index a2ae95c30..6ab8c30f3 100644 --- a/coolstore-partner-service/coolstore-partner-service.iml +++ b/coolstore-partner-service/coolstore-partner-service.iml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + @@ -81,6 +95,11 @@ + + + + + @@ -123,8 +142,6 @@ - - From c94f8083d667727cc6b42679cd1f886f2639e5dc Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Mon, 19 Jun 2023 10:29:47 +0800 Subject: [PATCH 02/11] miniProgramJsCodeSession --- .../java/com/cool/store/http/WechatRest.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java index 86a15111a..3dd34c7e7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java @@ -9,8 +9,10 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.utils.RedisUtilPool; +import com.cool.store.utils.RestTemplateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -50,12 +52,17 @@ public class WechatRest { requestMap.put("secret", secret); requestMap.put("js_code", jsCode); requestMap.put("grant_type","authorization_code"); - CodeSessionDTO codeSessionDTO = null; + ResponseEntity responseEntity = null; try { - codeSessionDTO = httpRestTemplateService.getForObject(url, CodeSessionDTO.class, requestMap); - log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, JSONObject.toJSONString(codeSessionDTO)); + responseEntity = RestTemplateUtil.loadGet(url, CodeSessionDTO.class); + log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); + if(Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()){ + return responseEntity.getBody(); + } + } catch (Exception e) { - log.error("调用微信服务异常", e); + log.info("调用微信服务异常{}", e); + throw new ServiceException(ErrorCodeEnum.WX_SERVICE_ERROR); } return null; } @@ -75,7 +82,7 @@ public class WechatRest { if (StringUtils.isBlank(token)) { throw new ServiceException(ErrorCodeEnum.GET_ACCESSTOKEN_ERROR); } - + redisUtilPool.setString(cacheAccessToken, token, 7000); accessToken = token; } catch (Exception e) { From 3c7ba3ce4915ed2a5bbbbc7af21aa36dc567dad0 Mon Sep 17 00:00:00 2001 From: pserimal Date: Mon, 19 Jun 2023 12:02:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9D=A2=E8=AF=95=E5=88=97=E8=A1=A8interview?= =?UTF-8?q?Id->interviewPlanId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerInterviewPlanMapper.xml | 2 +- .../cool/store/controller/FlowController.java | 7 +++++++ .../src/main/resources/static/simsun.ttc | Bin 17909384 -> 0 bytes 3 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 coolstore-partner-webc/src/main/resources/static/simsun.ttc diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 1c4c85d9f..64c657998 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -246,7 +246,7 @@ + + + + + update region set deleted = 1 where region_id = #{regionId} + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java index 28bc91c6a..26ad47d82 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java @@ -11,6 +11,9 @@ import com.cool.store.dto.dept.DepartmentEventDTO; */ public interface EnterpriseSyncService { + /** + * 全量同步 + */ void syncAll(); /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java index 564dbfe43..450fb20fe 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java @@ -85,7 +85,10 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { } } - + /** + * 同步组织架构 + * @return + */ private Pair, Multimap> syncRegion(){ //同步部门 List departments = isvHttpRequest.getSubDepartments(CommonConstants.ROOT_DEPT_ID_STR, true); @@ -239,13 +242,23 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { dealUserLeaderDept(updateLeaderDeptMap); break; case DEPARTMENT_DELETED: - syncAll(); + boolean leafNode = regionDAO.isLeafNode(departmentDetail.getId()); + if(leafNode){ + //叶子节点的时候会删除部门 + regionDAO.deleteRegionByRegionId(departmentDetail.getId()); + }else{ + syncAll(); + } break; default: return; } } + /** + * 处理用户负责部门信息 + * @param leaderDeptMap + */ public void dealUserLeaderDept(Multimap leaderDeptMap){ if(leaderDeptMap.isEmpty()){ return; From 9280a011675a4911168832eb32e9a8e2d9214dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Mon, 19 Jun 2023 16:26:08 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/CreateQualifyVerifyReq.java | 6 ++++++ .../java/com/cool/store/service/impl/FeiShuServiceImpl.java | 1 + .../main/java/com/cool/store/controller/FlowController.java | 2 ++ 3 files changed, 9 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java index 7f0dd8739..0d0853b57 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java @@ -15,12 +15,18 @@ public class CreateQualifyVerifyReq { @ApiModelProperty(value = "线索id", required = true) private String lineId; + @ApiModelProperty(value = "会议安排id", required = true) + private String interviewPlanId; + @ApiModelProperty(value = "会议id", required = true) private String interviewId; @ApiModelProperty(value = "加盟商id", required = true) private String partnerId; + @ApiModelProperty(value = "开发主管用户id", required = true) + private String devtDirectorId; + @ApiModelProperty(value = "面试表现记录", required = true) private String summary; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java index 7b59a61e3..c10af2681 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java @@ -100,6 +100,7 @@ public class FeiShuServiceImpl implements FeiShuService { if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong) || (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) { freeBusyInfo.setFree(false); + break; } } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java index 006f988f7..14f4e3b92 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java @@ -5,6 +5,7 @@ import com.cool.store.request.CreateQualifyVerifyReq; import com.cool.store.request.FinishInterviewReq; import com.cool.store.response.ResponseResult; import com.cool.store.service.FlowService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023-06-14 13:47 * @Description: 流程相关 */ +@Api(tags = "流程相关接口") @RestController @RequestMapping({"/flow"}) public class FlowController { From 459436512c7484d3753642969f65f83bc4e0ae88 Mon Sep 17 00:00:00 2001 From: pserimal Date: Mon, 19 Jun 2023 16:34:52 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AFprocessInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/vo/interview/InterviewVO.java | 10 +++++++++- .../java/com/cool/store/service/InterviewService.java | 4 ++-- .../cool/store/service/impl/InterviewServiceImpl.java | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java index 2e6102b82..55c79cb9e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author: young.yu * @Date: 2023-06-08 16:26 @@ -22,6 +24,9 @@ public class InterviewVO { @ApiModelProperty("资质审核流程id") private String qualifyVerifyId; + @ApiModelProperty("意向合同编号") + private String intentionContractNo; + @ApiModelProperty("审核通过时间") private String passTime; @@ -76,7 +81,10 @@ public class InterviewVO { @ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true) private Integer status; - @ApiModelProperty(value = "面试过程信息", required = false) + @ApiModelProperty(value = "面试过程信息视频URL数组", required = true) + private List processInfoList; + + @ApiModelProperty(value = "面试过程信息未解析String", required = false) private String processInfo; @ApiModelProperty("授权码") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java index 062e418e2..2d387e950 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java @@ -18,8 +18,8 @@ public interface InterviewService { List getInterviewList(GetInterviewListReq request); /** - * 根据面试会议id查询面试信息 - * @param interviewId + * 根据面试会议计划id查询面试信息 + * @param interviewPlanId * @return */ InterviewVO getInterviewInfo(String interviewPlanId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 9566352a9..7e055b7d1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -73,6 +73,10 @@ public class InterviewServiceImpl implements InterviewService { @Override public InterviewVO getInterviewInfo(String interviewPlanId) { InterviewVO vo = hyPartnerInterviewPlanMapper.getInterviewInfo(interviewPlanId); + //将 processInfo 解析为 List + List split = Arrays.asList(vo.getProcessInfo().split(",")); + vo.setProcessInfoList(split); + vo.setProcessInfo(""); //查询面试官和记录人信息 EnterpriseUserBaseInfoVO interviewerInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getInterviewerId()); vo.setInterviewerName(interviewerInfo.getName());