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

4645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
王非凡
64192e3a1d Merge #49 into master from cc_20260302_login_password 
验证码登录

* cc_20260302_login_password: (3 commits squashed)

  - 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/49
 2026-03-03 03:29:16 +00:00
王非凡
7916851939 Merge #46 into master from cc_20251208_visit 
fix:拜访线索查询逻辑修改

* cc_20251208_visit: (40 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

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

  - Merge branch &#39;master&#39; into cc_20251208_visit

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

  - fix:新增字段

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

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - fix:铺位导出新增字段

  - fix:铺位导出新增字段

  - fix

  - fix:我的铺位导出

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java

  - 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/46
 2026-02-26 10:30:35 +00:00
王非凡
98652ccb1d Merge #45 into master from cc_20260226_fix 
fix:建店资料查询收款银行信息区分品牌

* cc_20260226_fix: (2 commits squashed)

  - fix:建店资料查询收款银行信息区分品牌

  - fix:sql缺失

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/45
 2026-02-26 07:23:29 +00:00
王非凡
17239536b4 Merge #44 into master from cc_20251208_visit 
fix:我的铺位导出

* cc_20251208_visit: (39 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

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

  - Merge branch &#39;master&#39; into cc_20251208_visit

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

  - fix:新增字段

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

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - fix:铺位导出新增字段

  - fix:铺位导出新增字段

  - fix

  - fix:我的铺位导出

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java

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/44
 2026-02-11 06:39:46 +00:00
王非凡
9b734c66df Merge #43 into master from cc_20251208_visit 
拜访记录和铺位导出

* cc_20251208_visit: (37 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

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

  - Merge branch &#39;master&#39; into cc_20251208_visit

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

  - fix:新增字段

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

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - 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/43
 2026-02-10 09:02:43 +00:00
suzhuhong
1ab6ccf7b7 feat:合同接口添加管理区域 2026-02-10 16:54:57 +08:00
suzhuhong
ceaaa7f28e feat:如果有缓存 但是没返回数据 清除缓存 针对信发设备切换账号 2026-02-10 10:32:10 +08:00
suzhuhong
e4e0d35f8b feat:建店调整 2026-02-09 14:18:44 +08:00
suzhuhong
584291d342 feat:阶段处理人调整 2026-02-07 09:29:31 +08:00
suzhuhong
ab2b12af38 feat:修改运营顾问 2026-02-06 16:11:30 +08:00
suzhuhong
9f747f8185 feat:修改运营顾问 2026-02-06 16:04:40 +08:00
正新
ef2e5ce17f Merge #42 into master from cc_20260123_operations_consultant 
feat:加盟合同阶段未完成 不支持调整运营顾问

* cc_20260123_operations_consultant: (3 commits squashed)

  - feat:门店转让运营顾问

  - Merge branch &#39;master&#39; into cc_20260123_operations_consultant

  - 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/42
 2026-02-06 07:45:10 +00:00
王非凡
d9d7431b50 Merge #41 into master from cc_20251208_visit 
fix:过滤未分配招商经理的线索

* cc_20251208_visit: (27 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

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

  - Merge branch &#39;master&#39; into cc_20251208_visit

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

  - fix:新增字段

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

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

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/41
 2026-02-04 11:39:40 +00:00
王非凡
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 &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

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

  - Merge branch &#39;master&#39; 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
王非凡
d3a331798c Merge #39 into master from cc_20251208_visit 
fix:拜访我的加盟商取消管辖权限过滤

* cc_20251208_visit: (21 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

  - 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/39
 2026-02-03 09:53:24 +00:00
正新
83fcb84f9d Merge #37 into master from cc_20251208_visit 
feat:拜访字段调整

* cc_20251208_visit: (19 commits squashed)

  - feat:拜访记录

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

  - fix:新增状态转义字段

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

  - fix

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

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

  - fix:空校验

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

  - fix

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

  - fix:拜访记录统计

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

  - fix:字段转义

  - feat:拜访调整

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

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

  - feat:拜访字段调整

  - 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/37
 2026-02-02 09:56:33 +00:00
正新
88e7d99f85 Merge #38 into master from cc_20260202_point 
feat:点位添加名称搜索

* cc_20260202_point: (1 commits squashed)

  - 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/38
 2026-02-02 09:56:21 +00:00
suzhuhong
8de93e7de5 feat:reigonId 2026-02-02 17:20:18 +08:00
suzhuhong
42b5f27389 feat:获取管理下级区域 2026-02-02 14:40:05 +08:00
正新
b3b98d980a Merge #36 into master from cc_20260130_store 
feat:：门店信息提供

* cc_20260130_store: (1 commits squashed)

  - 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/36
 2026-02-02 06:36:14 +00:00
suzhuhong
77fea915e9 feat:：加盟商 2026-01-30 10:37:30 +08:00
suzhuhong
af5775f3fa feat:：加盟商 2026-01-30 10:33:15 +08:00
正新
8375e9e258 Merge #35 into master from cc_20260128_fix 
feat:PC端分配装修团队列表：查询条件：支持“施工团队”查询

* cc_20260128_fix: (1 commits squashed)

  - feat:PC端分配装修团队列表：查询条件：支持“施工团队”查询

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/35
 2026-01-29 09:50:34 +00:00
suzhuhong
a8fe891b70 feat:加盟合同审批 使用招商所属区域 2026-01-27 09:42:33 +08:00
suzhuhong
aa250fa6d0 Merge remote-tracking branch 'origin/master' 2026-01-23 16:39:49 +08:00
suzhuhong
6d55e5fcdf feat:发布 2026-01-23 16:39:34 +08:00
王非凡
3206a20dd6 Merge #34 into master from cc_20260116_new_field 
fix:加盟合同新增字段推送红圈通

* cc_20260116_new_field: (5 commits squashed)

  - fix:加盟合同新增字段

  - fix:加盟合同新增字段

  - Merge branch &#39;refs/heads/master&#39; into cc_20260116_new_field
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - fix:加盟合同新增字段推送红圈通

  - Merge branch &#39;master&#39; into cc_20260116_new_field
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

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/34
 2026-01-23 08:37:13 +00:00
正新
10dca9bf9b Merge #32 into master from cc_20260113_open 
开业日期报备

* cc_20260113_open: (15 commits squashed)

  - feat:阶段调整

  - feat:开业阶段调整

  - feat:开业日期报备

  - feat:开业日期报备代办

  - feat:文本通知

  - feat:数据处理

  - fix:bug

  - feat:通知功能

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java

  - feat:开业代办新增代办预计开业时间

  - feat:开业时间查询

  - feat:开业

  - feat:PC计划开业时间

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

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/32
 2026-01-23 06:49:50 +00:00
王非凡
41ae24478d Merge #31 into master from cc_2021104_twelve_points 
十二分

* cc_2021104_twelve_points: (34 commits squashed)

  - fix:启用禁用规则合并

  - Merge branch &#39;refs/heads/master&#39; into cc_2021104_twelve_points

  - fix:惩处规则列表新增描述字段

  - fix:新增用户管辖门店列表接口

  - fix:门店列表接口新增门店积分字段

  - fix:查询问题修复；新增草稿状态

  - fix:申请单审批补充审批人字段

  - fix:修改门店积分限制0-12

  - fix:积分流水接口修复；申请单查询接口添加日期筛选

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

  - fix:惩处单复议申请查询异常修复

  - fix:小程序惩处单详情接口字段补充

  - fix:查询字段补充

  - fix

  - fix:转义

  - fix

  - fix:新增撤销复议申请单接口

  - fix:补充字段

  - fix:补充字段

  - fix:新增门店分数接口

  - fix:申请单新增筛选条件

  - fix:门店积分接口返回参数修改

  - fix:小程序规则分页查询接口改为Post

  - fix:问题修复

  - fix:十二分导入

  - fix:导入状态部分失败改为失败

  - fix:字段补充

  - fix:异步下Excel导入图片临时文件被清理的问题

  - fix:扣分申请导入图片路径修改并使用CDN

  - fix:导入图片上传oss文件类型修改为图片

  - fix:批量审批

  - fix:批量审批新增备注字段

  - fix:字段补充

  - Merge branch &#39;master&#39; into cc_2021104_twelve_points
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/31
 2026-01-23 06:48:53 +00:00
正新
1b1684f373 Merge #33 into master from cc_20260106_point_update 
铺位管理 地图

* cc_20260106_point_update: (15 commits squashed)

  - feat:铺位改造

  - Merge branch &#39;refs/heads/master&#39; into cc_20260106_point_update

  - feat:铺位调整

  - feat:新增字段

  - feat:新增字段

  - feat:新增字段

  - feat:点位ID 处理校验规则

  - feat:保存铺位 返回点位ID

  - feat:根据主数据门店编码获取CRM点位数据

  - feat:铺位

  - feat:我的铺位 根据管辖

  - fix:bug 查询

  - fix:PC端点位新增直接关联铺位 bug

  - feat:过滤已开店的铺位

  - Merge branch &#39;master&#39; into cc_20260106_point_update

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/33
 2026-01-23 06:48:32 +00:00
suzhuhong
44ba00dc38 feat:加盟费待缴费发送时间调整 2026-01-23 14:18:48 +08:00
suzhuhong
96047eeb99 fix:推送合同 2026-01-22 09:30:48 +08:00
suzhuhong
dc22d18322 fix:加盟合同财务阶段 财务之后推送 默认一小时自动分配 2026-01-21 19:04:44 +08:00
suzhuhong
399e46033f fix:加盟阶段bug处理 2026-01-20 10:32:57 +08:00
王非凡
c28515123a Merge #30 into master from cc_20260106_process_change 
fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办，财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/30
 2026-01-19 09:11:34 +00:00
正新
eb9b8bdf00 Merge #29 into master from cc_20260114_selectPoint 
feat:发送通知节点调整

* cc_20260114_selectPoint: (2 commits squashed)

  - feat:选址之后才能开启缴费

  - 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/29
 2026-01-19 07:11:31 +00:00
正新
e11327f837 Merge #27 into master from cc_20260116_fix 
feat:实训数据去除

* cc_20260116_fix: (3 commits squashed)

  - feat:培训去掉身份证校验

  - fix:带出新管家信息

  - 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/27
 2026-01-19 07:05:53 +00:00
正新
0ad517dce6 Merge #28 into master from cc_20260114_fix 
feat:红圈通邮箱

* cc_20260114_fix: (8 commits squashed)

  - feat:加盟公司自有店-开放推送红圈通

  - feat:加盟公司自有店-开放推送红圈通 2、结束门店解绑铺位 3、红圈通新增招商所属大区 运营顾问字段

  - feat:红圈通新增推送邮箱

  - fix:大区取值

  - fix:测试

  - feat:推送人员名称

  - feat:结束跟进  目前是任何时候都可以，单独解绑铺位 需要在加盟签约合同之前

  - 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/28
 2026-01-19 07:05:42 +00:00
suzhuhong
159f112113 feat:添加授权码展示 2026-01-16 16:45:01 +08:00
suzhuhong
dd1ba96380 feat:添加授权码展示 2026-01-16 16:44:47 +08: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
suzhuhong
08845557fd feat:开业验收其他角色 返回空 2026-01-14 17:35:56 +08:00
suzhuhong
a9d876b320 feat:开业验收其他角色 返回空 2026-01-14 17:15:06 +08:00
正新
6a3d589d0c Merge #25 into master from cc_20260113_fix 
feat:updateLineRegion

* cc_20260113_fix: (1 commits squashed)

  - feat:updateLineRegion

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/25
 2026-01-13 07:17:35 +00:00
王非凡
e62cd9bff9 Merge #24 into master from cc_20260107_fix_bug 
fix:铺位提交时区域取招商区域

* cc_20260107_fix_bug: (3 commits squashed)

  - 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/24
 2026-01-07 02:01:12 +00:00
suzhuhong
a2262f8ea7 feat:测试 2026-01-06 15:56:01 +08:00
suzhuhong
8c8109d535 feat:正新鸡排统管默认都是是 不根据填写的来 2026-01-06 14:16:40 +08:00
suzhuhong
81ea1fbe5f fix:分配 2026-01-06 10:23:43 +08:00
苏竹红
8954d56f45 Merge #23 into master from cc_20260105_fix 
fix:查询招商经理

* cc_20260105_fix: (1 commits squashed)

  - fix:查询招商经理

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/23
 2026-01-05 13:00:42 +00:00
suzhuhong
2e942501be fix:优化查询 2026-01-05 18:10:45 +08:00