Commit Graph

839 Commits

Author SHA1 Message Date
feng.li
fee5f82f6d 修改腾讯音视频userSig过期时间 2024-01-25 16:16:14 +08:00
feng.li
57387a305d 面试后结束跟进短信通知 2024-01-15 13:57:48 +08:00
feng.li
d5aeaf364c 飞书通知优化及添加会销协作人通知增加移动端跳转 2024-01-12 11:10:45 +08:00
feng.li
450a307f9b Merge branch 'dev/fix/partner1.5.3_20240103' into pre
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java
2024-01-02 16:44:13 +08:00
feng.li
f430a79d63 使用日期格式枚举类 2024-01-02 16:42:33 +08:00
feng.li
76d051898c 生成房间号日期格式错误 2024-01-02 16:17:26 +08:00
feng.li
fcaa71a274 生成房间号日期格式错误 2024-01-02 16:15:59 +08:00
feng.li
12810baa00 线索报名会销跳转地址 2023-12-28 13:34:03 +08:00
feng.li
696f58f93a 飞书通知跳转路径错误修改 2023-12-28 11:20:31 +08:00
苏竹红
a34c9063df getPartnerInfo 添加字段 2023-12-26 12:11:54 +08:00
feng.li
8dc9fad270 展会相关短信模板code修改 2023-12-25 15:11:35 +08:00
feng.li
e97de23d9c 消息卡片跳转链接添加定义路径及路径参数 2023-12-22 17:03:43 +08:00
苏竹红
e109a752ba startDate 格式修改 2023-12-20 13:38:25 +08:00
feng.li
a74f480916 通用信息更改方案 2023-12-14 19:22:46 +08:00
苏竹红
a05215c89e 签到+结束会销 2023-12-13 16:33:26 +08:00
feng.li
69c3fa7714 Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-12 18:54:21 +08:00
苏竹红
1f59b5c9eb 会销报名+取消报名 2023-12-12 18:03:08 +08:00
feng.li
af8727ff6e 增加招商经理同意面试预约操作日志记录 2023-12-12 17:30:57 +08:00
feng.li
85991fcc15 防止用户多次预约面试 2023-12-11 18:02:15 +08:00
feng.li
a1b33f2ed8 修改通用信息方法 2023-12-08 18:25:32 +08:00
feng.li
acda73ffc1 会销开始面试接口 2023-12-06 18:42:18 +08:00
苏竹红
8d096b4f27 会销组+会销 2023-12-06 18:21:19 +08:00
xiaodong.hu
6d268cd523 Merge branch 'dev/feat/partner1.5.2_20231121' into hxd/feat/partner1.5.2 2023-11-13 13:39:33 +08:00
xiaodong.hu
53eb52227a 添加公海私海分页 2023-11-13 10:41:15 +08:00
feng.li
f1c458a280 招商经理直接预约面试 2023-11-08 17:13:02 +08:00
xiaodong.hu
3006e240f4 添加新增线索与批量新增添加操作日志 2023-11-06 18:14:07 +08:00
xiaodong.hu
bb63eee4fa 更改ec日志展示 2023-10-30 18:02:57 +08:00
xiaodong.hu
5e3672a674 添加ec同步后员工端接收飞书通知 2023-10-27 17:24:29 +08:00
xiaodong.hu
5498832bd4 更改手机号校验code码,重构ec同步代码 2023-10-27 13:55:38 +08:00
xiaodong.hu
d9a7606579 Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java
2023-10-26 19:04:09 +08:00
xiaodong.hu
107bfe9d35 提交ec同步历史线索功能 2023-10-26 18:59:38 +08:00
feng.li
5311eb94d2 添加事件中心发送短信&优化代码&添加单测 2023-10-24 13:56:54 +08:00
俞扬
4b323b5e70 Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-23 20:17:09 +08:00
俞扬
2871c5d68b 发送邀请短信-增加手机号码校验 2023-10-23 20:16:58 +08:00
feng.li
7db4368a30 增加接入沪上阿姨事件中心相关类 2023-10-23 15:58:49 +08:00
俞扬
4310b7577c 发送邀请短信 2023-10-23 13:49:18 +08:00
zhangchenbiao
f003392307 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-10-09 15:49:05 +08:00
zhangchenbiao
9277413d89 access_token 缓存时间变更 2023-10-09 15:48:55 +08:00
苏竹红
a4c4525173 此号码已绑定其他微信 2023-10-09 14:00:57 +08:00
feng.li
bd78c693c8 面试开始前一天及30分钟前提醒 2023-09-22 14:23:28 +08:00
俞扬
cb15d0e045 点单小程序跳转 2023-09-19 16:46:51 +08:00
俞扬
95bfeab0bc Merge branch 'master' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
2023-09-19 10:34:52 +08:00
俞扬
cef8be0f29 Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
2023-09-14 17:22:02 +08:00
俞扬
da782f7e48 加盟商短信逻辑修改 2023-09-14 17:19:56 +08:00
zhangchenbiao
2c44793c85 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2023-09-13 20:19:56 +08:00
zhangchenbiao
b4d15f5d6a 新增美颜&线索基本信息修改相关接口 2023-09-13 20:18:42 +08:00
苏竹红
60ed31a313 同一个微信号校验 2023-09-13 14:11:45 +08:00
feng.li
8cf947a02f 从MDM接口获取所属大区和业务区域 2023-09-12 14:16:05 +08:00
俞扬
1800db3303 Merge branch 'master' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2023-09-12 13:12:31 +08:00
苏竹红
9c13abb092 意向区域新增不限&新增字段&手机号校验 2023-09-11 14:44:06 +08:00