Commit Graph

353 Commits

Author SHA1 Message Date
feng.li
72b33abad8 给被自动关闭会销关联线索发通知 2023-12-19 16:15:00 +08:00
feng.li
fd403c1f88 自动关闭会销任务 2023-12-19 14:31:02 +08:00
苏竹红
e92b9ec3eb 会销组下会销列表+手机号查询线索信息 2023-12-13 17:03:27 +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
feng.li
765f6574f0 增加自动打开面试房间操作日志记录 2023-12-12 18:54:08 +08:00
苏竹红
1f59b5c9eb 会销报名+取消报名 2023-12-12 18:03:08 +08:00
feng.li
af8727ff6e 增加招商经理同意面试预约操作日志记录 2023-12-12 17:30:57 +08:00
苏竹红
79bb2a6059 会销报名线索列表 2023-12-08 17:46:24 +08:00
苏竹红
9123442b6b 会销报名列表 2023-12-08 16:19:04 +08:00
feng.li
acda73ffc1 会销开始面试接口 2023-12-06 18:42:18 +08:00
苏竹红
8d096b4f27 会销组+会销 2023-12-06 18:21:19 +08:00
feng.li
5e911d88ba 1.6controller&service 2023-11-30 14:45:59 +08:00
feng.li
c8d7069369 revert logback config 2023-11-23 10:11:11 +08:00
xiaodong.hu
e238560b03 注释 2023-11-15 19:36:28 +08:00
xiaodong.hu
6c4e1028b1 Merge branch 'dev/feat/partner1.5.2_20231121' into pre 2023-11-15 19:06:01 +08:00
feng.li
45f2ac1363 配置文件默认激活配置错误修改 2023-11-15 14:54:39 +08:00
xiaodong.hu
58df2bc03c 删除logback 2023-11-14 15:31:45 +08:00
xiaodong.hu
3b4ba5bb9c 更改naocs配置文件 2023-11-14 14:59:20 +08:00
feng.li
bb2adedd69 nacos切换 2023-11-14 14:51:11 +08:00
feng.li
bc8b970470 添加ELK接入的依赖 2023-11-13 18:45:47 +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
feng.li
b600d80d10 Merge branch 'master' into dev/feat/partner1.5.2_20231121 2023-11-08 14:28:16 +08:00
feng.li
027e972482 获取各预约时间段预约情况 2023-11-07 22:41:00 +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
3e0b0321f3 feishuUserId设置遗漏 2023-10-26 17:51:03 +08:00
feng.li
59e3fa13fa 替换短信发送方案为事件中心方法 2023-10-25 16:35:42 +08:00
feng.li
4c73375592 EnterpriseUserMapper问题修改 2023-10-25 15:04:21 +08:00
feng.li
fe3d706fbb enterprise_user相关mapper增加feishu_user_id并添加根据user_id批量获取feishu_user_id 2023-10-25 11:39:24 +08:00
feng.li
d2a6b81fa8 替换全部飞书通知发送方法为通过事件中心发送 2023-10-24 16:45:38 +08:00
feng.li
5311eb94d2 添加事件中心发送短信&优化代码&添加单测 2023-10-24 13:56:54 +08:00
苏竹红
cfde2c0c81 Merge remote-tracking branch 'hsayi/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-23 13:56:02 +08:00
苏竹红
23214127f1 招商经理 2023-10-23 13:55:44 +08:00
俞扬
4310b7577c 发送邀请短信 2023-10-23 13:49:18 +08:00
陈伏伽
d310587c0e 标签组列表排序 2023-10-20 17:38:00 +08:00
陈伏伽
0ca2897252 标签组及子标签接口 2023-10-19 17:19:30 +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
zhangchenbiao
6dc8d68280 fix 2023-09-15 09:45:36 +08:00
zhangchenbiao
1be2b624d2 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-09-14 19:31:37 +08:00
zhangchenbiao
ab0ff87463 fix 2023-09-14 19:30:44 +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
xiaodong.hu
54d36658cd Merge branch 'dev/feat/partner1.4_20231009' into hxd/feat/partner1.4
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
2023-09-14 10:50:58 +08:00
xiaodong.hu
7a628950ed 1.修改面试通知函通过节点
2.添加ec意向区域同步
3.定时同步800请求来源
2023-09-14 10:41:39 +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