suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,582 Commits 1 Branch 0 Tags
2e5d661b85868deb9049148e0f2d864982a1b18e
Commit Graph

80 Commits

Author SHA1 Message Date
王非凡
2e5d661b85 Merge #40 into master from cc_20251208_visit 
fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

* cc_20251208_visit: (25 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch 'master' into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/40
 2026-02-04 09:59:43 +00:00
正新
82a49a03d2 Merge #26 into master from cc_20260105_partner 
feat:测试

* cc_20260105_partner: (8 commits squashed)

  - feat:加盟商意向书字段调整

  - feat:意向审核

  - feat:加盟商意向申请

  - feat:新增其他备注

  - feat:返回信息缺失

  - feat:资质阶段审核完成才回成为加盟商

  - feat:大区查询阶段状态是6

  - feat:测试

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26
 2026-01-14 11:03:42 +00:00
王非凡
e34aea7a40 Merge #19 into master from cc_20251223_orgChange 
组织架构迁移

* cc_20251223_orgChange: (32 commits squashed)

  - fix:角色枚举值变更

  - fix:待办-缴纳加盟费/保证金中，删除企微督导查询权限，督导查询权限改为招商经理；待办-建店资料中，删除企微督导查询权限

  - fix:开店管理-查询我负责的招商经理或运营顾问为当前用户的；查询我管辖的如果当前用户是招商经理则查招商区域

  - feat:组织架构切换调整

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:门店详情新增招商所属大区 运营顾问

  - fix:获取可选择的大区新增type字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:修改招商所属大区

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:新增分店 修改分店

  - feat:operations_consultant

  - fix:获取平台建店左侧小窗详情接口新增招商区域名称字段

  - feat:合同开始之后需要分配才能触发后续阶段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:新增招商区域名称字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:大区查询添加enableFlag字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:代办查询bug修改

  - fix:字段缺失补充

  - Merge branch &#39;master&#39; into cc_20251223_orgChange
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

  - fix:修改基本资料bug

  - fix:线索列表接口新增招商所属区域名称字段

  - fix:加盟商资质审核通过自动建店时带出招商所属区域

  - fix:补充提交

  - fix:修改开店详情接口修改招商所属区域

  - fix:工作台待办返回招商区域名称字段

  - fix:开店详情接口招商所属区域id为0的数据返回null

  - fix:字段补充

  - fix:招商所属大区字段补充

  - fix:字段补充

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/19
 2025-12-31 06:56:47 +00:00
shuo.wang
d07d46afb9 fix 2025-07-21 09:47:41 +08:00
shuo.wang
deaec48f66 fix 没有门店看不到加盟商 2025-06-26 14:11:26 +08:00
shuo.wang
e281730b84 工作台搜索 2025-05-27 13:49:30 +08:00
shuo.wang
b41ecc436a 待办排序+更新时间 2025-05-21 11:23:43 +08:00
苏竹红
dabede0f88 feat:bug 2025-04-03 17:11:53 +08:00
shuo.wang
879db971ea 增加，门店恢复状态，删除门店接口 2025-03-24 15:01:45 +08:00
shuo.wang
1f81bc47fd fix partnerList 2025-03-05 13:47:39 +08:00
shuo.wang
dea88558c5 fix 2025-03-01 17:41:22 +08:00
shuo.wang
ca884abbd2 fix 2025-03-01 17:38:38 +08:00
shuo.wang
f793b09c89 fix 2025-03-01 17:34:16 +08:00
shuo.wang
ef12033705 fix 2025-03-01 17:16:53 +08:00
shuo.wang
96f8ad4a7e 新建分店接口 2025-01-08 16:08:56 +08:00
shuo.wang
3579bb5f7c 查找加盟商接口，改造跟进日志接口 2025-01-08 14:19:07 +08:00
shuo.wang
0bf59881df fix 2024-11-20 10:22:14 +08:00
shuo.wang
03c93e98f5 fix 2024-11-20 10:17:02 +08:00
shuo.wang
9225ca130e fix 2024-11-19 18:18:31 +08:00
shuo.wang
b3d43ed041 fix 工作台字段 2024-11-07 15:31:49 +08:00
shuo.wang
265e993e7e fix 列表可见范围 2024-11-05 18:32:23 +08:00
shuo.wang
52af6ba903 多品牌使用 2024-11-05 18:23:00 +08:00
shuo.wang
ad906eadca 多品牌使用 2024-11-05 13:44:01 +08:00
shuo.wang
f71d969744 多品牌使用 2024-11-04 20:50:20 +08:00
shuo.wang
31e6e8a1a2 多品牌使用 2024-11-04 19:55:55 +08:00
苏竹红
fd0352c208 feat:排序 2024-10-12 19:14:19 +08:00
苏竹红
f8b71ecc55 线索批量分配 2024-07-19 18:58:41 +08:00
苏竹红
b10ed6eea3 线索批量分配 2024-07-19 16:26:57 +08:00
苏竹红
9f9ec026a4 加盟模式 2024-07-12 16:27:36 +08:00
wangxiaopeng
c9ed6dc779 线索加大区 2024-06-04 09:34:42 +08:00
苏竹红
afc850e28f hd 2024-05-29 11:01:03 +08:00
苏竹红
989dd892c2 hd 2024-05-28 20:23:36 +08:00
苏竹红
566d8265ae 面试 2024-05-24 17:11:54 +08:00
苏竹红
ca5df53433 面试 2024-05-24 14:12:03 +08:00
苏竹红
31ef1dfe79 面试官信息 2024-05-23 15:46:23 +08:00
zhangchenbiao
3182f050af fix 2024-05-21 10:41:51 +08:00
zhangchenbiao
01d2b58b36 fix 2024-05-21 10:15:37 +08:00
shuo.wang
6bb8448d5d 修改sql getLines 2024-05-15 13:53:02 +08:00
苏竹红
12a5dd3ace lineSource 2024-05-10 10:19:20 +08:00
shuo.wang
3b258cd364 修改运营方案列表bug 2024-05-08 15:05:19 +08:00
苏竹红
34fa4b5a4e 待处理 我的数据 2024-05-07 15:21:56 +08:00
shuo.wang
6a39b8c10f 三方验收 2024-05-05 21:03:12 +08:00
苏竹红
28c78b88e2 公海状态 2024-04-30 11:30:49 +08:00
shuo.wang
dd4a6a5bcf 开业运营方案 2024-04-24 22:22:33 +08:00
shuo.wang
389a4d572a Merge branch 'refs/heads/cc_partner_init_zhuangxiu' into cc_partner_init 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml
 2024-04-24 19:07:04 +08:00
shuo.wang
4404d250d6 开业运营方案 2024-04-24 19:02:58 +08:00
苏竹红
0578c21582 待分配线索 2024-04-23 16:59:06 +08:00
苏竹红
793f07bb9b bug 2024-04-19 09:52:02 +08:00
wangxiaopeng
49e82f751b 重新缴费 2024-04-16 18:55:21 +08:00
苏竹红
bf1432316d 转让 2024-04-16 17:11:58 +08:00