Commit Graph

388 Commits

Author SHA1 Message Date
feng.li
5311eb94d2 添加事件中心发送短信&优化代码&添加单测 2023-10-24 13:56:54 +08:00
feng.li
1852546bd7 添加800加盟类型字段 2023-10-23 16:11:28 +08:00
feng.li
7db4368a30 增加接入沪上阿姨事件中心相关类 2023-10-23 15:58:49 +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
苏竹红
8f47bdfc55 在线状态 2023-10-20 10:41:22 +08:00
陈伏伽
ac68c59ab4 意向区域id修改成路径 2023-10-19 17:33:26 +08:00
陈伏伽
0ca2897252 标签组及子标签接口 2023-10-19 17:19:30 +08:00
陈伏伽
98c01656d9 用户私海查询调整 2023-10-19 15:37:34 +08:00
陈伏伽
1616aff2f8 request添加入参 2023-10-19 14:21:33 +08:00
zhangchenbiao
0bae71ac94 部门更新 2023-10-09 10:32:44 +08:00
xiaodong.hu
2e23c295f2 更改800请求来源直接调用;修复800回调失败 2023-09-25 18:14:11 +08:00
feng.li
8f3d16df4f Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-09-22 16:06:26 +08:00
zhangchenbiao
c723af1381 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-09-22 14:40:59 +08:00
zhangchenbiao
25471df161 删除不用字段 2023-09-22 14:40:11 +08:00
feng.li
bd78c693c8 面试开始前一天及30分钟前提醒 2023-09-22 14:23:28 +08:00
俞扬
cb15d0e045 点单小程序跳转 2023-09-19 16:46:51 +08:00
苏竹红
e1fa7c0d72 添加字段 2023-09-19 10:37: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
665ffc974b 新增恶心的时间搜索 2023-09-15 16:39:56 +08:00
苏竹红
403534f808 类型改为Integer 2023-09-15 16:34:56 +08:00
苏竹红
c62c2a5192 是否有认识的人 逻辑添加 2023-09-15 12:23:22 +08:00
苏竹红
96550202b4 添加字段 2023-09-15 11:06:36 +08:00
苏竹红
e1fc5487e4 queryBaseInfo 常州区域 2023-09-14 19:37:43 +08:00
苏竹红
0d0c08ead2 Ec 意向区域回显 2023-09-14 19:22:39 +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
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
苏竹红
00598ca308 BaseInfo 新增字段 2023-09-11 14:50:41 +08:00
苏竹红
9c13abb092 意向区域新增不限&新增字段&手机号校验 2023-09-11 14:44:06 +08:00
zhangchenbiao
6841c7a532 同步数据处理 2023-09-08 11:04:30 +08:00
zhangchenbiao
331da47300 删除corpId 2023-09-08 10:45:33 +08:00
俞扬
2fbeb8864a 通话回调接口调整 2023-09-05 20:36:32 +08:00
苏竹红
dab470155d 转让招商经理 优化 2023-08-30 19:23:28 +08:00
xiaodong.hu
52620f2048 Merge branch 'master' into hxd/feat/ecSyncLabel 2023-08-29 18:04:59 +08:00
xiaodong.hu
fa2d08915d 添加ec标签同步完整代码 2023-08-28 13:53:50 +08:00
xiaodong.hu
05c6ef16bd 添加ec标签同步部分代码 2023-08-25 17:56:02 +08:00
xiaodong.hu
76a24e2b14 提交ec同步部分代码 2023-08-25 14:13:55 +08:00
zhangchenbiao
9ebff24684 修改备注 2023-08-24 17:36:01 +08:00
zhangchenbiao
77389e6102 编辑跟进任务一小时内发送消息 2023-08-24 17:07:07 +08:00
xiaodong.hu
3a8334b8fc Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-24 15:41:21 +08:00
xiaodong.hu
d62816d6f2 添加导入线索姓名长度校验 2023-08-24 15:40:48 +08:00
xiaodong.hu
30535d5a20 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-24 14:49:49 +08:00