suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
苏竹红
2023-08-21 15:29:52 +08:00
parent aace92cc49 f80e96ecb7
commit 76bcc06332
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java
View File

@@ -9,12 +9,12 @@ import com.alibaba.fastjson.JSONObject;
*/
public enum FeiShuNoticeMsgEnum {
ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"),
common_notice("工作台通知", "{0}", "img_v2_45d7a901-1eab-498b-a760-b38d287f0c1g"),
ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"),
TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"),
INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_69eb6e5f-bf12-4a02-a47f-b17ce24fcfeg"),
FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"),
INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"),
;
private String title;

2
coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
View File

@@ -207,7 +207,7 @@
</select>
<update id="updateUndoTaskStatusToOverdue">
<![CDATA[ update hy_follow_task set task_status = '2' where task_status = '0' and deadline < now() ]]>
<![CDATA[ update hy_follow_task set task_status = '2' where task_status = '0' and deadline <= now() ]]>
</update>
<select id="getFollowTaskList" resultMap="BaseResultMap">

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
View File

@@ -7,10 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.cool.store.constants.ExcelErrorConstants;
import com.cool.store.dao.*;
import com.cool.store.entity.*;
import com.cool.store.enums.AcceptAdjustTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.LineStatusEnum;
import com.cool.store.enums.WorkflowStatusEnum;
import com.cool.store.enums.*;
import com.cool.store.exception.ServiceException;
import com.cool.store.oss.OSSServer;
import com.cool.store.request.AddLineRequest;
@@ -98,7 +95,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
hyPartnerUserInfoDAO.insertSelective(resultUser);
HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO();
resultLine.setPartnerId(partnerId).setCreateTime(new Date());
resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
//判断招商经理是否为空
if (StringUtil.isNotEmpty(request.getInvestmentManager())) {

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
@Slf4j
@Service
public class NoticeService {
@Value("${feishu.notice.link.url}")
private String linkUrl;
@Autowired