From 668463e53ed1a5738552c8710b9d24ba6ab1fa22 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 20:44:11 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HyPartnerBaseInfoServiceImpl.java | 19 +++++++++++++++++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 3fec5dca7..20da4570a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.*; import com.cool.store.dto.log.AddTagsDTO; import com.cool.store.dto.log.BlackListLogDTO; import com.cool.store.dto.log.LineLogInfo; +import com.cool.store.dto.log.WantInfoUpdateDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; @@ -19,6 +21,7 @@ import com.cool.store.request.PartnerBaseInfoRequest; import com.cool.store.service.HyPartnerBaseInfoService; import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.service.HyPhoneLocationService; +import com.cool.store.service.LogService; import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.PartnerBaseInfoVO; @@ -26,6 +29,7 @@ import com.cool.store.vo.PartnerUserInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -76,6 +80,9 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { @Resource HyPartnerCertificationInfoMapper hyPartnerCertificationInfoMapper; + @Autowired + private LogService logService; + @Override public Boolean addTags(LoginUserInfo user, AddTagsRequest addTagsRequest) { @@ -115,14 +122,20 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); return Boolean.TRUE; } + WantInfoUpdateDTO.BaseInfoUpdate beforeBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); + WantInfoUpdateDTO.BaseInfoUpdate afterBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); + HyPartnerBaseInfoDO baseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); if(baseInfoDO == null){ baseInfoDO = new HyPartnerBaseInfoDO(); fillBaseInfo(baseInfoDO, request); hyPartnerBaseInfoDAO.insertSelective(baseInfoDO); + BeanUtil.copyProperties(baseInfoDO, afterBaseInfoUpdate); }else { + BeanUtil.copyProperties(baseInfoDO, beforeBaseInfoUpdate); fillBaseInfo(baseInfoDO, request); hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(baseInfoDO); + BeanUtil.copyProperties(baseInfoDO, afterBaseInfoUpdate); } if(request.getSubmitFlag()){ // 更新线索表状态 @@ -146,6 +159,12 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { } // 清空暂存信息 redisUtilPool.delKey(cacheKey); + //记录日志 + PartnerUserInfoVO operator = PartnerUserHolder.getUser(); + WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) + .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + .beforeBaseInfoUpdate(beforeBaseInfoUpdate).afterBaseInfoUpdate(afterBaseInfoUpdate).build(); + logService.recordPartnerBizLog(operator, baseInfoDO.getPartnerLineId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index f3d661b98..23cd64c73 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -199,7 +199,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic intentInfoDO = new HyPartnerIntentInfoDO(); fillIntentInfo(intentInfoDO, request); hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); - BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); + BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate); }else { BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); fillIntentInfo(intentInfoDO, request); From 455420bd90bc1aff14ed3bb5ee34bad7b83a56df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jul 2023 21:03:42 +0800 Subject: [PATCH 02/17] getUserChannelId --- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 46566cb05..816466d2d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -198,6 +198,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); hyPartnerLineInfoDO.setLineStatus(1); + hyPartnerLineInfoDO.setUserChannelId(x.getUserChannelId()); list.add(hyPartnerLineInfoDO); }); hyPartnerLineInfoDAO.batchInsert(list); From a280f6e762875af09e3ccbaff36ce9409c0dbe39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jul 2023 21:36:14 +0800 Subject: [PATCH 03/17] userChannelId --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 992dcc18c..24aa2bc15 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -45,7 +45,8 @@ workflow_stage, workflow_status, line_status, - investment_manager + investment_manager, + user_channel_id ) values @@ -53,7 +54,8 @@ #{record.workflowStage}, #{record.workflowStatus}, #{record.lineStatus}, - #{record.investmentManager}) + #{record.investmentManager}, + #{record.userChannelId})) From 4e4413f45574c47ec2aa855ad6805ea62a101ea6 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 21:41:51 +0800 Subject: [PATCH 04/17] getByIdCard --- .../src/main/resources/mapper/HyPartnerBaseInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index d5b2aa4e2..f867dc6d3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -294,7 +294,7 @@ * from hy_partner_base_info a left join hy_partner_line_info b on a.partner_line_id = b.id - where a.id_card = #{idCard} and ( b.line_status != 3 or b.deleted = 1 ) + where a.id_card = #{idCard} and ( b.line_status != 3 and b.deleted = 0 ) From 0e43313ff2c1ef7a931d01e9c83d0f497653db8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jul 2023 21:43:50 +0800 Subject: [PATCH 05/17] userChannelId --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 24aa2bc15..b1204aab8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -55,7 +55,7 @@ #{record.workflowStatus}, #{record.lineStatus}, #{record.investmentManager}, - #{record.userChannelId})) + #{record.userChannelId}) From 5491866dc7cfe55c762ca102df474de0d4f7fc41 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 22:19:21 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=84=8F=E5=90=91=E4=B9=A6=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/OperateLogFieldValueEnum.java | 10 ++++-- .../com/cool/store/enums/OperateTypeEnum.java | 4 +-- .../cool/store/dto/log/WantInfoUpdateDTO.java | 5 +-- .../impl/HyPartnerClerkServiceImpl.java | 33 +++++++++++++++++-- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java index 5a3eec0f0..20ec8ddb4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java @@ -38,8 +38,14 @@ public enum OperateLogFieldValueEnum { BEFORE_USERINFO_UPDATE("beforeUserinfoUpdate", "修改前的用户信息"), AFTER_USERINFO_UPDATE("afterUserinfoUpdate", "修改后的用户信息"), - BEFORE_INTENT_INFO_UPDATE("beforeIntentInfoUpdate", "修改前的意向申请"), - AFTER_INTENT_INFO_UPDATE("afterIntentInfoUpdate", "修改后的意向申请"), + BEFORE_BASE_INFO_UPDATE("beforeBaseInfoUpdate", "修改前的意向书基本信息"), + AFTER_BASE_INFO_UPDATE("afterBaseInfoUpdate", "修改后的意向书基本信息"), + + BEFORE_INTENT_INFO_UPDATE("beforeIntentInfoUpdate", "修改前的意向行业信息"), + AFTER_INTENT_INFO_UPDATE("afterIntentInfoUpdate", "修改后的意向行业信息"), + + BEFORE_CLERK_INFO_UPDATE("beforeClerkUpdate", "修改前的意向书员工信息"), + AFTER_CLERK_INFO_UPDATE("afterClerkUpdate", "修改后的意向书员工信息"), ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java index bac7c5d30..49809a28e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java @@ -29,8 +29,8 @@ public enum OperateTypeEnum { REJECT_INTERVIEW("reject_interview", "合作资格面试-拒绝并结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON,REJECT_REAL_REASON, CERTIFY_FILE)), CREATE_QUALIFYVERIFY("create_qualifyverify", "合作资格面试-创建资格审核", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME,SUMMARY,QUALI_VERIFY_CONTENT)), USERINFO_UPDATE("userinfo_update", "修改（修改意向信息）", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_USERINFO_UPDATE, AFTER_USERINFO_UPDATE)), - INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)), - INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)), + INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_BASE_INFO_UPDATE, AFTER_BASE_INFO_UPDATE, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE, BEFORE_CLERK_INFO_UPDATE, AFTER_CLERK_INFO_UPDATE)), + INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_BASE_INFO_UPDATE, AFTER_BASE_INFO_UPDATE, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE, BEFORE_CLERK_INFO_UPDATE, AFTER_CLERK_INFO_UPDATE)), ADD_TAGS("add_tags", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), ; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java index 992e4d49d..5bc8267dd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.experimental.SuperBuilder; import java.util.Date; +import java.util.List; /** * @Author: wxp @@ -20,8 +21,8 @@ public class WantInfoUpdateDTO extends LogBasicDTO{ private IntentInfoUpdate beforeIntentInfoUpdate; private IntentInfoUpdate afterIntentInfoUpdate; - private ClerkUpdate beforeClerkUpdate; - private ClerkUpdate afterClerkUpdate; + private List beforeClerkUpdate; + private List afterClerkUpdate; @Data public static class BaseInfoUpdate{ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java index 993ec77d1..8a87b5415 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java @@ -1,26 +1,37 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.HyPartnerClerkDAO; +import com.cool.store.dto.enterprise.SysDepartmentDTO; +import com.cool.store.dto.log.WantInfoUpdateDTO; import com.cool.store.entity.HyPartnerClerkDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.OperateTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.PartnerClerkInfoRequest; import com.cool.store.service.HyPartnerClerkService; +import com.cool.store.service.LogService; +import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.vo.PartnerClerkVO; +import com.cool.store.vo.PartnerUserInfoVO; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -40,6 +51,9 @@ public class HyPartnerClerkServiceImpl implements HyPartnerClerkService { @Resource private RedisUtilPool redisUtilPool; + @Autowired + private LogService logService; + @Override public List getPartnerClerkList(Long lineId) { List hyPartnerClerkList = hyPartnerClerkDAO.getHyPartnerClerkList(lineId); @@ -60,15 +74,18 @@ public class HyPartnerClerkServiceImpl implements HyPartnerClerkService { @Override public Boolean submitPartnerClerkInfo(PartnerClerkInfoRequest request) { log.info("HyPartnerClerkServiceImpl#submitPartnerClerkInfo request:{}", JSONObject.toJSONString(request)); + if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } String cacheKey = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); if(!request.getSubmitFlag()){ // 自动保存时 redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); return Boolean.TRUE; } - if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } + List beforeClerkUpdate = Lists.newArrayList(); + List afterClerkUpdate = Lists.newArrayList(); + List beforClerkDOList = hyPartnerClerkDAO.listByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); hyPartnerClerkDAO.deleteByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); List clerkDOList = new ArrayList<>(); ListUtils.emptyIfNull(request.getPartnerClerkRequestList()).stream().forEach(x->{ @@ -83,8 +100,18 @@ public class HyPartnerClerkServiceImpl implements HyPartnerClerkService { }); if (CollectionUtils.isNotEmpty(clerkDOList)){ hyPartnerClerkDAO.batchInsert(clerkDOList); + afterClerkUpdate = JSONObject.parseArray(JSONObject.toJSONString(clerkDOList), WantInfoUpdateDTO.ClerkUpdate.class); + } + if (CollectionUtils.isNotEmpty(beforClerkDOList)){ + beforeClerkUpdate = JSONObject.parseArray(JSONObject.toJSONString(beforClerkDOList), WantInfoUpdateDTO.ClerkUpdate.class); } redisUtilPool.delKey(cacheKey); + //记录日志 + PartnerUserInfoVO operator = PartnerUserHolder.getUser(); + WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) + .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + .beforeClerkUpdate(beforeClerkUpdate).afterClerkUpdate(afterClerkUpdate).build(); + logService.recordPartnerBizLog(operator, request.getPartnerLineId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); return true; } From 5a90881c5820c80fda872d74a9cc8445ef7482d9 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Wed, 5 Jul 2023 09:54:33 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=84=8F=E5=90=91=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/OperateTypeEnum.java | 2 +- .../store/service/impl/HyPartnerBaseInfoServiceImpl.java | 4 +++- .../store/service/impl/HyPartnerIntentInfoServiceImpl.java | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java index 49809a28e..1171c577c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java @@ -29,7 +29,7 @@ public enum OperateTypeEnum { REJECT_INTERVIEW("reject_interview", "合作资格面试-拒绝并结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON,REJECT_REAL_REASON, CERTIFY_FILE)), CREATE_QUALIFYVERIFY("create_qualifyverify", "合作资格面试-创建资格审核", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME,SUMMARY,QUALI_VERIFY_CONTENT)), USERINFO_UPDATE("userinfo_update", "修改（修改意向信息）", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_USERINFO_UPDATE, AFTER_USERINFO_UPDATE)), - INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_BASE_INFO_UPDATE, AFTER_BASE_INFO_UPDATE, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE, BEFORE_CLERK_INFO_UPDATE, AFTER_CLERK_INFO_UPDATE)), + INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, AFTER_BASE_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE, AFTER_CLERK_INFO_UPDATE)), INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_BASE_INFO_UPDATE, AFTER_BASE_INFO_UPDATE, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE, BEFORE_CLERK_INFO_UPDATE, AFTER_CLERK_INFO_UPDATE)), ADD_TAGS("add_tags", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 20da4570a..0413bd4e3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -124,6 +124,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { } WantInfoUpdateDTO.BaseInfoUpdate beforeBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); WantInfoUpdateDTO.BaseInfoUpdate afterBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); + OperateTypeEnum operateTypeEnum = OperateTypeEnum.INTENT_INFO_UPDATE; HyPartnerBaseInfoDO baseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); if(baseInfoDO == null){ @@ -131,6 +132,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { fillBaseInfo(baseInfoDO, request); hyPartnerBaseInfoDAO.insertSelective(baseInfoDO); BeanUtil.copyProperties(baseInfoDO, afterBaseInfoUpdate); + operateTypeEnum = OperateTypeEnum.INTENT_INFO_SUBMIT; }else { BeanUtil.copyProperties(baseInfoDO, beforeBaseInfoUpdate); fillBaseInfo(baseInfoDO, request); @@ -164,7 +166,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) .beforeBaseInfoUpdate(beforeBaseInfoUpdate).afterBaseInfoUpdate(afterBaseInfoUpdate).build(); - logService.recordPartnerBizLog(operator, baseInfoDO.getPartnerLineId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); + logService.recordPartnerBizLog(operator, baseInfoDO.getPartnerLineId(), operateTypeEnum,log); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 23cd64c73..8fa325653 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -193,13 +193,14 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic } WantInfoUpdateDTO.IntentInfoUpdate beforeIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); WantInfoUpdateDTO.IntentInfoUpdate afterIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); - + OperateTypeEnum operateTypeEnum = OperateTypeEnum.INTENT_INFO_UPDATE; HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); if(intentInfoDO == null){ intentInfoDO = new HyPartnerIntentInfoDO(); fillIntentInfo(intentInfoDO, request); hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate); + operateTypeEnum = OperateTypeEnum.INTENT_INFO_SUBMIT; }else { BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); fillIntentInfo(intentInfoDO, request); @@ -231,7 +232,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) .beforeIntentInfoUpdate(beforeIntentInfoUpdate).afterIntentInfoUpdate(afterIntentInfoUpdate).build(); - logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); + logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), operateTypeEnum, log); return hyPartnerLineInfoDO.getLineStatus(); } From 1b642c98c7c3c9a5327d2f45bc9fdfa1a8991814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 5 Jul 2023 11:06:48 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E5=AE=98=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C=E5=85=88?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9D=A2=E8=AF=95=E5=AE=98=E6=97=A5=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=88=A0=E9=99=A4=E8=80=81=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InterviewServiceImpl.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) 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 0efa8d080..f76c618e5 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 @@ -169,16 +169,7 @@ public class InterviewServiceImpl implements InterviewService { if(RoomStatus.WAIT_FOR_OPEN.getCode() != Integer.parseInt(interviewInfo.getRoomStatus())){ throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); } - //1.原面试官日程删除 - DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); - deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); - deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); - deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); - UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); - if(userCalendarsEventDTO == null ){ - throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); - } - //2.新面试官日程新增 + //1.新面试官日程新增 CreateCalendarEventDTO createCalendarEventDTO = new CreateCalendarEventDTO(); createCalendarEventDTO.setStartTime(DateUtil.parse(interviewInfo.getStartTime()).getTime()); createCalendarEventDTO.setEndTime(DateUtil.parse(interviewInfo.getEndTime()).getTime()); @@ -189,6 +180,16 @@ public class InterviewServiceImpl implements InterviewService { if(userCalendarEvent == null ){ throw new ApiException(ErrorCodeEnum.CREATE_CALENDAR_EVENT_FAIL); } + //2.原面试官日程删除 + DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); + deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); + deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); + deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); + UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); + if(userCalendarsEventDTO == null ){ + throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); + } + // 3.面试信息变更 HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); record.setId(Long.valueOf(request.getInterviewPlanId())); From 865140fc1cb0d95a44210b1617cb0163dd642055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 5 Jul 2023 14:32:29 +0800 Subject: [PATCH 09/17] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A7=94?= =?UTF-8?q?=E6=89=98=E5=90=8E=E4=BF=AE=E6=94=B9=E6=97=A5=E7=A8=8B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/InterviewServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f76c618e5..de92066e4 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 @@ -190,18 +190,18 @@ public class InterviewServiceImpl implements InterviewService { throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); } - // 3.面试信息变更 + // 3.面试信息计划变更 HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); record.setId(Long.valueOf(request.getInterviewPlanId())); record.setInterviewer(request.getNewInterviewerId()); record.setUpdateTime(new Date()); - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); - - //更新面试计划信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.valueOf(request.getInterviewPlanId())); record.setFeishuCalendarId(userCalendarEvent.getCalendarId()); record.setFeishuScheduleId(userCalendarEvent.getEventId()); + hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); + + //更新面试信息 + HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); + hyPartnerInterviewDO.setInterviewPlanId(Long.valueOf(request.getInterviewPlanId())); hyPartnerInterviewDO.setInterviewer(request.getNewInterviewerId()); hyPartnerInterviewDO.setUpdateTime(new Date()); hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); From 23ff2d5eb6acba871c5491054e4bc18cb9af1104 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Wed, 5 Jul 2023 16:00:31 +0800 Subject: [PATCH 10/17] updateByPrimaryKeySelective --- .../store/service/impl/HyPartnerBaseInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index 0413bd4e3..a1af191bc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -222,9 +222,6 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { oldBaseInfo.getSex(), oldBaseInfo.getBirthdate(), oldBaseInfo.getNation(), oldBaseInfo.getLiveAddress(), oldBaseInfo.getStatus()); newBaseInfo.setStatus(oldBaseInfo.getStatus()); hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(newBaseInfo); - // 老的身份证信息置空 - fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null); - oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); //修改名称 HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId); HyPartnerIntentInfoDO oldIntentInfo = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(oldLineInfo.getPartnerId(), oldLineInfo.getId()); @@ -235,6 +232,9 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType()); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); } + // 老的身份证信息置空 + fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null); + oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo); hyPartnerIntentInfoDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); hyPartnerClerkDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); From be70a0531c372761bb644bd7a4f2989c91f1d263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 5 Jul 2023 16:40:16 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=B8=B4=E6=9C=9F=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerInterviewPlanDAO.java | 7 ++-- .../cool/store/dao/HyPartnerLineInfoDAO.java | 6 +-- .../mapper/HyPartnerInterviewPlanMapper.java | 3 +- .../store/mapper/HyPartnerLineInfoMapper.java | 2 +- .../mapper/HyPartnerInterviewPlanMapper.xml | 9 +++-- .../mapper/HyPartnerLineInfoMapper.xml | 7 ++-- .../store/dto/partner/AdvanceLineDTO.java | 19 ++++++++++ .../com/cool/store/service/DeskService.java | 3 +- .../store/service/impl/DeskServiceImpl.java | 37 ++++++++++++++----- .../cool/store/controller/DeskController.java | 3 +- 10 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/AdvanceLineDTO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java index 5e1903c61..ffb93cf2e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao; +import com.cool.store.dto.partner.AdvanceLineDTO; import com.cool.store.dto.partner.PartnerInterviewInfoDTO; import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; import com.cool.store.entity.HyPartnerInterviewPlanDO; @@ -36,11 +37,11 @@ public class HyPartnerInterviewPlanDAO { * @param currentDate * @return */ - public Integer getCurrentDateInterviewCount(String userId,String currentDate){ + public List getCurrentDateInterviewCount(String userId, String currentDate, String endDate){ if (StringUtils.isEmpty(userId)){ - return 0; + return new ArrayList<>(); } - return hyPartnerInterviewPlanMapper.getCurrentDateInterviewCount(userId,currentDate); + return hyPartnerInterviewPlanMapper.getCurrentDateInterviewCount(userId,currentDate,endDate); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 35bcf9b29..cfc0623a5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -64,11 +64,11 @@ public class HyPartnerLineInfoDAO { } - public Integer getAdventLineCount( String userId, String currentDate){ + public List getAdventLineCount( String userId, String currentDate,String endDate){ if (StringUtils.isEmpty(userId)){ - return 0; + return new ArrayList<>(); } - return hyPartnerLineInfoMapper.getAdventLineCount(userId,currentDate); + return hyPartnerLineInfoMapper.getAdventLineCount(userId,currentDate,endDate); } public StageCountDTO selectStagePendingCount(String userId){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index 463f355ab..aa5c8ecb5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.dto.message.RemindInterviewMsgDTO; +import com.cool.store.dto.partner.AdvanceLineDTO; import com.cool.store.dto.partner.PartnerInterviewInfoDTO; import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; import com.cool.store.entity.HyPartnerInterviewPlanDO; @@ -39,7 +40,7 @@ public interface HyPartnerInterviewPlanMapper { * @param currentDate * @return */ - Integer getCurrentDateInterviewCount(@Param("userId") String userId, @Param("currentDate") String currentDate); + List getCurrentDateInterviewCount(@Param("userId") String userId, @Param("currentDate") String currentDate, String endDate); /** * todo 当天面试数据需要修改 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index a1830c98f..bfcfab942 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -61,7 +61,7 @@ public interface HyPartnerLineInfoMapper { * @param currentDate * @return */ - Integer getAdventLineCount(@Param("userId") String userId, @Param("currentDate") String currentDate); + List getAdventLineCount(@Param("userId") String userId, @Param("currentDate") String currentDate, @Param("endDate") String endDate); /** * 招商经理 对应各阶段待处理数据 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 8fa1eaf91..4067d2f79 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -255,17 +255,18 @@ where id = #{id} - + select interview_date as date,count(1) as count from hy_partner_interview_plan and interviewer = #{userId} - and interview_date = #{currentDate} + and interview_date BETWEEN #{currentDate} and #{endDate} - + group by interview_date + - select count(1) from hy_partner_line_info + From 16d89dd3708becb1063447b29e9aa791d8e338ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 5 Jul 2023 20:17:52 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=B8=B4=E6=9C=9F=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 22173bc7e..d41f33d6b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -276,6 +276,7 @@ ifnull(sum(if(start_time>#{startTime} and end_time #{endTime},1,0)),0) as lastSevenDayInterviewCount FROM hy_partner_interview_plan where interviewer = #{userId} + and deleted = 0 and application_approved = 1 From 1bf8207722c35794419eda63344f428b9c416ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 5 Jul 2023 21:04:55 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dto/log/LineLogInfo.java | 3 ++- .../store/service/impl/CommonServiceImpl.java | 11 ++++++++++- .../store/service/impl/FlowServiceImpl.java | 11 +++++------ .../cool/store/service/impl/LogServiceImpl.java | 17 ++++++++++++----- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java index 36eaf062f..c5349d800 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java @@ -68,7 +68,8 @@ public class LineLogInfo { } public static boolean checkParams(LineLogInfo params){ - if(StringUtils.isAnyBlank(params.getPartnerId(), params.getOperateUserId(), params.getOperateUsername())){ + //部分操作没有操作人，这里不再校验操作人 + if(StringUtils.isAnyBlank(params.getPartnerId())){ log.info("lineLogInfo string:{}", JSONObject.toJSONString(params)); return false; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java index 787bc14e9..e1eb3a19a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java @@ -75,7 +75,7 @@ public class CommonServiceImpl implements CommonService { if(partnerCertificationInfoDO != null){ intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); } - return getInterviewTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | "+intentionContractNo); + return getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | "+intentionContractNo); } return null; @@ -96,6 +96,15 @@ public class CommonServiceImpl implements CommonService { } + public String getVerifyResultTips(Long partnerLineId, OperateTypeEnum operateTypeEnum, String action) { + StringBuffer sb = new StringBuffer(); + sb.append("于 ").append(StringUtil.REPLACE_0).append(" ").append(action); + String content = sb.toString(); + return getSuitableTipsInfo(content, partnerLineId, + operateTypeEnum, + OperateLogFieldValueEnum.OPERATE_TIME.getCode()); + } + public String getSuitableTipsInfo(String content, Long partnerLineId, OperateTypeEnum operateTypeEnum, String... replaceKeys) { List hyPartnerTaskInfoLogDOS = hyPartnerTaskInfoLogMapper.selectByPartnerLineIdAndOperateType(partnerLineId, operateTypeEnum.getCode()); if (CollectionUtils.isEmpty(hyPartnerTaskInfoLogDOS)) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index d608969d4..c33a407f0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.HyInterviewDAO; import com.cool.store.dto.log.CreateQualifyVerifyDTO; +import com.cool.store.dto.log.LogBasicDTO; import com.cool.store.dto.mdm.AccessTokenDTO; import com.cool.store.dto.response.MDMResultDTO; import com.cool.store.entity.*; @@ -260,10 +261,9 @@ public class FlowServiceImpl implements FlowService { //TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失 genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId); //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + LogBasicDTO log = LogBasicDTO.builder().operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) .build(); - logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_PASS,log); + logService.recordBizLog(null,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_PASS,log); //审核未通过 } else if ("CANCELED".equals(request.getInstanceStatus())) { CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); @@ -272,10 +272,9 @@ public class FlowServiceImpl implements FlowService { closeFollowRequest.setType("reject"); hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); - LoginUserInfo operator = CurrentUserHolder.getUser(); - CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + LogBasicDTO log = LogBasicDTO.builder().operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) .build(); - logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_REJECT,log); + logService.recordBizLog(null,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_REJECT,log); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java index a493d8822..00cdd40f5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java @@ -47,13 +47,20 @@ public class LogServiceImpl implements LogService { return; } HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfos.get(0); - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getUserId(), - operator.getName(), operateTypeEnum, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); + LineLogInfo lineLogInfo = null; + if(operator!= null){ + lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getUserId(), + operator.getName(), operateTypeEnum, + WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), + hyPartnerLineInfoDO.getWorkflowStatus(), ""); + }else { + lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, null, + null, operateTypeEnum, + WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), + hyPartnerLineInfoDO.getWorkflowStatus(), ""); + } lineLogInfo.setData(logData); hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - int i =1; }catch (Exception e){ LOG.error("recordBizLog error",e); e.printStackTrace(); From f9dcea0ef22bc4346ff0d2ba0327e1170b2ddd52 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Thu, 6 Jul 2023 10:17:04 +0800 Subject: [PATCH 16/17] fixMobileOpenid --- .../main/java/com/cool/store/constants/CommonConstants.java | 4 +--- .../cool/store/service/impl/WechatMiniAppServiceImpl.java | 5 ++++- .../src/main/resources/application-ab.properties | 2 +- .../src/main/resources/application-local.properties | 2 +- .../src/main/resources/application-online.properties | 2 +- .../src/main/resources/application-ab.properties | 1 + .../src/main/resources/application-local.properties | 1 + .../src/main/resources/application-online.properties | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 0ecec8b2a..565f341e2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -119,7 +119,5 @@ public class CommonConstants { public static final String ALLOCATION = "allocation"; public static final String TRANSFER = "transfer"; - - public static final String FIX_MOBILE_OPENID_TEST = "HSAY5531DA7"; - public static final String FIX_MOBILE_OPENID_ONLINE = "HSAY4AF322E"; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index a934431e9..042839a6b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -64,6 +64,9 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { @Value("${weixin.appSecret}") private String wxAppSecret; + @Value("${fixMobileOpenid}") + private String fixMobileOpenid; + @Override public PartnerUserInfoVO miniProgramLogin(MiniProgramLoginDTO param) { @@ -173,7 +176,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { @Override public PartnerUserInfoVO getUserInfo(String mobile, String openId) { PartnerUserInfoVO userInfoVO = new PartnerUserInfoVO(); - if(CommonConstants.FIX_MOBILE_OPENID_TEST.equals(mobile) || CommonConstants.FIX_MOBILE_OPENID_ONLINE.equals(mobile) ){ + if(fixMobileOpenid.equals(mobile)){ userInfoVO.setMobile(mobile); userInfoVO.setOpenid(mobile); userInfoVO.setPartnerId(""); diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index ddd3bd6c6..da322ce70 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -62,7 +62,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 - +fixMobileOpenid=HSAY5531DA7 #xxljob配置 xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin xxl.job.executor.appname = ${spring.application.name} diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 917b733fc..3350c3265 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -64,7 +64,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 - +fixMobileOpenid=HSAY5531DA7 #MDM hs.mdm.baseUrl=http://10.56.21.30 hs.mdm.appkey = HSAYPartner diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index 4fa84ad9e..3764060eb 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -58,7 +58,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=d851f2a9ac90474abecdc2fbb148d4d7 - +fixMobileOpenid=HSAY4AF322E #阿里云ak sk aliyun.accessKeyId= aliyun.accessKeySecret= diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index ef55e653f..62c2e93e6 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -61,6 +61,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=77fea013c3a6459685b83c21a2fc3411 +fixMobileOpenid=HSAY5531DA7 #飞书通知 feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index e6a23a115..94027cc8b 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -63,6 +63,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=77fea013c3a6459685b83c21a2fc3411 +fixMobileOpenid=HSAY5531DA7 #飞书通知 feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index e7f0dcf4d..1ce5a8613 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -55,7 +55,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=d851f2a9ac90474abecdc2fbb148d4d7 - +fixMobileOpenid=HSAY4AF322E #阿里云ak sk aliyun.accessKeyId= aliyun.accessKeySecret= From c42bd7717e3fd50c4ee01fd7ab6ce54703a0c95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 6 Jul 2023 10:24:24 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=8D=A2=E7=BB=91=E5=BE=AE=E4=BF=A1=20?= =?UTF-8?q?=E6=8D=A2=E7=BB=91=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java | 8 ++++++++ .../com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java | 3 +++ .../main/resources/mapper/HyPartnerTaskInfoLogMapper.xml | 7 +++++++ .../store/service/impl/HyPartnerBaseInfoServiceImpl.java | 1 + 4 files changed, 19 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java index 44b92975b..eeb3e3f5b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.Objects; /** * @Author wxp @@ -45,4 +46,11 @@ public class HyPartnerTaskInfoLogDAO { insertSelective(logInfo); } + public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ + if (newLineId==null || Objects.isNull(oldLineId)){ + return 0; + } + return hyPartnerTaskInfoLogMapper.updateLineId(newPartnerId,newLineId, oldLineId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java index 52e5825b3..565a80c73 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java @@ -26,4 +26,7 @@ public interface HyPartnerTaskInfoLogMapper { int updateByPrimaryKeySelective(@Param("record") HyPartnerTaskInfoLogDO record); List selectByPartnerLineIdAndOperateType(@Param("partnerLineId") Long partnerLineId, @Param("operateType") String operateType); + + + int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml index 678e22ac3..bba982a28 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml @@ -142,4 +142,11 @@ and operate_type = #{operateType} order by create_time desc + + + update hy_partner_task_info_log + set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} + where partner_line_id = #{oldLineId} + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java index a1af191bc..8f7c5aa53 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java @@ -241,6 +241,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyPartnerInterviewPlanDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); hyInterviewDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); hyPartnerCertificationInfoMapper.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyPartnerTaskInfoLogDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); String cacheKeyBaseInfo = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, newPartnerId, newLindId); String cacheKeyClerkInfo = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY,newPartnerId, newLindId); String cacheKeyIntentInfo = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, newPartnerId, newLindId);