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

4743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
正新
8caf3b1a6a Merge #132 into master from revert-56b85c33-20f063dc 
Revert commit "Merge #128 into master from cc_20250512_uploadRentContract

* revert-56b85c33-20f063dc: (1 commits squashed)

  - Revert commit "Merge #128 into master from cc_20250512_uploadRentContract
    
    This reverts change request#128

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/132
 2026-05-12 09:56:16 +00:00
suzhuhong
fcb6fb0770 Merge remote-tracking branch 'origin/master' 2026-05-12 17:16:35 +08:00
suzhuhong
b7757af11c feat:merge冲突 2026-05-12 17:16:23 +08:00
王非凡
e667f2b577 Merge #129 into master from cc_20260512_point_zx 
新增机会点返回门店列表字段

* cc_20260512_point_zx: (1 commits squashed)

  - Add OpportunityInfoResponseStore class and update OpportunityInfoPageResponse

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/129
 2026-05-12 09:05:52 +00:00
正新
20f063dc55 Merge #128 into master from cc_20250512_uploadRentContract 
feat:租赁合同新增审批记录

* cc_20250512_uploadRentContract: (100 commits squashed)

  - fix:计划闭店时间修改

  - Merge branch &#39;cc_20250922_closeStore_w&#39; into cc_20250514_common_bak

  - feat：新签调整

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

  - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段

  - Merge branch &#39;cc_20250922_closeStore_w&#39; into cc_20250514_common_bak

  - feat：招商

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

  - feat：招商

  - feat：招商

  - feat：招商

  - fix:删除字段

  - Merge branch &#39;cc_20250922_closeStore_w&#39; into cc_20250514_common_bak

  - feat：招商

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

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

  - feat：数据同步 名称新增MX 等前缀

  - feat：上海魔盒未来食品有限公司

  - fix:修改查询逻辑

  - Merge branch &#39;cc_20260428_store_report&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - feat：id

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

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

  - Merge branch &#39;cc_20260507_smz&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java

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

  - feat：翻新

  - feat:用户列表为空

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:用户列表为空

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:RenewalRenovateApprovalVO

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:招商副总裁

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java

  - feat:招商副总裁审核

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:费用单调整

  - feat:招商经理

  - feat:招商经理

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:费用调整

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

  - fix:bug修复

  - fix:未开业门店试营业日期

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#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/job/XxlJobHandler.java

  - feat:新增审批

  - fix:开业日期报备不同步门店状态

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak

  - fix:字段名称修改

  - Merge branch &#39;cc_20250922_closeStore_w&#39; into cc_20250514_common_bak

  - fix:闭店中止新增审批记录

  - Merge branch &#39;cc_20250922_closeStore_w&#39; into cc_20250514_common_bak

  - feat:费用调整单

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:调整单

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - fix:试营业测试接口

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

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

  - feat:page

  - feat:自动分账

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

  - fix:私域二维码门店绑定关系缓存改为7天

  - Merge branch &#39;cc_20260226_fix&#39; into cc_20250514_common_bak

  - feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询

  - Merge branch &#39;cc_20260509_fix&#39; into cc_20250514_common_bak

  - fix:修改门店开业日期判断条件修改

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak

  - feat:填写添加门店

  - feat:建店代办处理

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

  - feat:userAuthMappingService

  - feat:addShopDecorationLog

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:待采购确认 审批流程

  - feat:问题修复

  - Merge branch &#39;cc_20260511_fix&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.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/ShopStageInfoMapper.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - feat:问题修复

  - feat:问题修复

  - feat:流水查询条件

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

  - feat：费用流水筛选条件

  - fix:歇业管理逻辑修改

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

  - feat：getAdjustAmount

  - Merge branch &#39;cc_20260511_close_up_modify&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
    #&#9;coolstore-partner-web/src/main/resources/application-ab.properties
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties
    #&#9;coolstore-partner-web/src/main/resources/application-online.properties
    #&#9;coolstore-partner-web/src/main/resources/application-test.properties

  - fix:合并冲突

  - Merge branch &#39;cc_20260408_close_up&#39; into cc_20250514_common_bak
    
    # 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/StoreDao.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:合并冲突

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

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

  - fix:火码歇业时机修改

  - Merge branch &#39;cc_20260408_close_up&#39; into cc_20250514_common_bak

  - feat:租赁合同新增审批记录

  - Merge branch &#39;master&#39; into cc_20250512_uploadRentContract
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

  - feat:merge冲突

  - feat:merge冲突

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/128
 2026-05-12 09:01:35 +00:00
王非凡
56b85c3322 Merge #126 into master from cc_20260408_close_up 
歇业管理逻辑修改

* cc_20260408_close_up: (31 commits squashed)

  - fix:歇业管理（部分）

  - fix:歇业管理（部分）

  - fix:审批逻辑修改；拒绝审批实现

  - fix:恢复开业申请及审批

  - fix:主流程补充

  - fix:主流程补充

  - fix:字段补充及逻辑修改

  - fix:字段补充

  - fix

  - fix:平台处理新增字段

  - fix

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

  - fix:歇业营业发送短信

  - fix:排序

  - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败

  - fix:申请单详情接口新增品牌字段

  - fix:新增列表筛选条件；审批单状态校验

  - Merge branch &#39;master&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - fix:歇业对接三方平台

  - fix:歇业对接三方平台

  - fix:日志

  - fix:歇业后自动恢复营业;抖音自动歇业三方对接

  - fix:歇业后自动恢复营业;抖音自动歇业三方对接

  - fix:火码平台账号处理状态初始化为已处理

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

  - fix:歇业管理逻辑修改

  - Merge branch &#39;cc_20260511_close_up_modify&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
    #&#9;coolstore-partner-web/src/main/resources/application-ab.properties
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties
    #&#9;coolstore-partner-web/src/main/resources/application-online.properties
    #&#9;coolstore-partner-web/src/main/resources/application-test.properties

  - fix:合并冲突

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

  - 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/126
 2026-05-12 08:13:30 +00:00
正新
27af1561ac Merge #127 into master from cc_20260512_fix 
feat:上传租赁合同代办

* cc_20260512_fix: (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/127
 2026-05-12 08:13:22 +00:00
suzhuhong
3c52808fc5 feat://V3.0 调整为加盟合同开始之后 直接开启 但是有部分已经到了待分配运营顾问 需要校验数据 如果证照没有开始 就说明是这类数据 就初始化 2026-05-12 16:01:42 +08:00
王非凡
0d65a1c4e9 Merge #123 into master from cc_20260511_fix_bug 
fix:闭店审批用户列表问题修复&amp;未开业门店更新试营业需要完成开店管理

* cc_20260511_fix_bug: (2 commits squashed)

  - 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/123
 2026-05-11 10:24:00 +00:00
正新
b517bfa957 Merge #125 into master from cc_20260511_fix 
feat：不需要运营顾问 也能推送

* cc_20260511_fix: (6 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - Merge branch &#39;master&#39; into cc_20260511_fix
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java

  - 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/125
 2026-05-11 10:23:53 +00:00
正新
5568f6678d Merge #124 into master from cc_20260511_fix 
feat：不需要运营顾问 也能推送

* cc_20260511_fix: (6 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - Merge branch &#39;master&#39; into cc_20260511_fix
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java

  - 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/124
 2026-05-11 09:01:25 +00:00
正新
ae241d40ca Merge #122 into master from cc_20260511_fix 
feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (5 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - Merge branch &#39;master&#39; into cc_20260511_fix
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.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/122
 2026-05-11 04:20:57 +00:00
正新
fd43c2c4b2 Merge #121 into master from cc_20260511_fix 
feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (3 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

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/121
 2026-05-11 04:15:31 +00:00
王非凡
162674c0b2 Merge #119 into master from cc_20260508_open_store_req 
门店新开店需求7&amp;主数据需求2

* cc_20260508_open_store_req: (4 commits squashed)

  - fix:未开业门店试营业日期

  - fix:开业日期报备不同步门店状态

  - fix:修改门店开业日期判断条件修改

  - Merge branch &#39;master&#39; into cc_20260508_open_store_req
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.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/119
 2026-05-10 13:44:42 +00:00
王非凡
a42a109b6c Merge #120 into master from cc_20250922_closeStore_w 
fix:闭店中止新增审批记录

* cc_20250922_closeStore_w: (100 commits squashed)

  - fix:新管家应退实退金额字段修改

  - fix:启用禁用规则合并

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

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

  - fix:闭店支行测试环境mock

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

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

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

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

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

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

  - fix:redis报错修复

  - 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

  - fix:新增字段

  - fix:字段补充

  - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息

  - fix:小程序退款信息列表修改

  - fix:闭店审批允许管理员审批

  - fix:字典项新增排序、编辑删除权限、关联字典项

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

  - fix:十二分值-扣分列表申请复议截止日期格式

  - fix:去除appealEndDate格式校验

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

  - fix:阶段名称修改

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java

  - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店

  - fix:提交新管家字段取值逻辑修改

  - Merge branch &#39;cc_20260128_dict_update&#39; into cc_2021104_twelve_points

  - fix:字典回显包含已删除字典项

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

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

  - fix:去除惩处单审批阶段；复议申请单证明图片非必填

  - fix:复议拒绝后惩处单直接生效

  - fix:扣分申请单证明图片改为非必填

  - fix

  - fix:字段转义

  - fix:惩处待处理包含带生效数据

  - fix:字段转义

  - fix:警告单金额和积分初始化为0

  - fix

  - fix:小程序接口字段转义

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

  - fix:十二分审批记录展示待审批人

  - fix

  - fix:惩处单复议申请逾期检查改为延时队列

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

  - fix:闭店定时任务过滤闭店状态补充

  - Merge branch &#39;refs/heads/master&#39; into cc_2021104_twelve_points
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

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

  - fix:闭店材料新增字段

  - fix

  - fix:小程序闭店材料详情新增字段

  - fix:闭店流程流转校验除授权书外是否已邮寄

  - fix:营帐通JWT生成

  - fix:营帐通JWT改为post

  - fix:修改secret

  - fix:配置

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

  - fix:十二分流水导出；流水新增规则描述字段

  - fix

  - fix:闭店新管家接口错误信息返回

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

  - Merge branch &#39;cc_20260412_jwt_ge&#39; into cc_20250922_closeStore_w

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

  - fix:闭店火码关闭账号不存在时忽略

  - Merge branch &#39;cc_2021104_twelve_points&#39; into cc_20250922_closeStore_w

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w
    
    # 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:闭店逻辑修改

  - fix:闭店待办列表新增字段

  - fix:计划闭店时间修改

  - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段

  - fix:删除字段

  - fix:字段名称修改

  - fix:闭店中止新增审批记录

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.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/120
 2026-05-10 13:41:41 +00:00
正新
b9b022a28d Merge #118 into master from cc_20260506_newsign 
feat:addShopDecorationLog

* cc_20260506_newsign: (14 commits squashed)

  - feat：新签调整

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：id

  - feat:招商副总裁审核

  - feat:招商经理

  - feat:招商经理

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - feat:建店代办处理

  - feat:addShopDecorationLog

  - feat:addShopDecorationLog

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/118
 2026-05-10 13:10:42 +00:00
王非凡
814bbc342e Merge #116 into master from cc_20260226_fix 
fix:私域二维码门店绑定关系缓存改为7天

* cc_20260226_fix: (5 commits squashed)

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

  - fix:sql缺失

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

  - fix:bug修复

  - fix:私域二维码门店绑定关系缓存改为7天

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/116
 2026-05-09 09:03:20 +00:00
正新
070d771587 Merge #117 into master from cc_20260509_fix 
feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询

* cc_20260509_fix: (1 commits squashed)

  - feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询

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/117
 2026-05-09 08:19:49 +00:00
suzhuhong
e813a56927 feat:装修阶段处理 2026-05-09 15:46:51 +08:00
王非凡
764247ab1d Merge #114 into master from cc_20260226_fix 
fix:bug修复

* cc_20260226_fix: (4 commits squashed)

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

  - fix:sql缺失

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

  - fix:bug修复

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/114
 2026-05-08 10:02:06 +00:00
正新
3fe65a48e0 Merge #115 into master from cc_20260507_smz 
feat:AI店 不初始化门店

* cc_20260507_smz: (3 commits squashed)

  - feat：数据同步 名称新增MX 等前缀

  - feat：上海魔盒未来食品有限公司

  - feat:AI店 不初始化门店

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/115
 2026-05-08 07:11:17 +00:00
正新
585a978f32 Merge #113 into master from cc_20260429_bug 
feat：问题修改

* cc_20260429_bug: (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/113
 2026-04-29 07:00:35 +00:00
正新
0b98bd4bb6 Merge #112 into master from cc_20260429_fix 
feat：门店列表新增标准店店型名称

* cc_20260429_fix: (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/112
 2026-04-29 05:39:17 +00:00
王非凡
22fcfc6a90 Merge #111 into master from cc_20260417_bonus 
fix:工资奖金

* cc_20260417_bonus: (28 commits squashed)

  - feat:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:门店实收相关接口

  - fix:新品销售门店级接口

  - fix:新品销售菜品列表接口；规则新增返回id

  - fix:新品销售菜品详情接口

  - fix:新品销售菜品接口补充

  - fix:小程序接口补充

  - fix

  - fix:新增实收、新品销售测试接口

  - fix:新增实收、新品销售测试接口

  - fix

  - fix:新增门店菜品列表接口

  - fix:同规则下无法新增相同菜品规则；新增小程序门店列表接口

  - fix

  - fix:小程序用户获取来源修改

  - fix:实收规则新增上月日均实收字段

  - 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/111
 2026-04-27 10:41:08 +00:00
王非凡
97f8a8669c Merge #110 into master from cc_2026_0422_feat_miniMap 
三方接口

* cc_2026_0422_feat_miniMap: (5 commits squashed)

  - feat: 添加机会点考察记录及相关请求和响应类

  - feat: 更新考察记录响应类，添加机会点信息及图片信息结构

  - feat：验签对于List的特殊处理

  - feat: 添加qualified字段到OpportunityInfoResponse以表示考察合格状态

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

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/110
 2026-04-27 10:12:33 +00:00
suzhuhong
19f119bbc6 feat：bug修复 2026-04-24 18:48:44 +08:00
suzhuhong
449f409522 feat：导出 2026-04-24 18:15:25 +08:00
suzhuhong
7385dc1d03 feat：导出 2026-04-24 18:07:03 +08:00
suzhuhong
98233e7032 feat：导出 2026-04-24 18:03:34 +08:00
正新
7c5a2c858d Merge #109 into master from cc_20260420_export 
feat：数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - 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/109
 2026-04-24 09:44:31 +00:00
suzhuhong
d885635728 fix:装修验收调整 可以先装修验收 再加盟商验收 2026-04-23 14:35:57 +08:00
suzhuhong
0fbbc860f6 fix:SHOP_SUB_STAGE_STATUS_91 2026-04-23 14:10:15 +08:00
suzhuhong
4cafc87961 Merge branch 'cc_20260422_feeItemId' 2026-04-23 10:46:31 +08:00
suzhuhong
cb1da9a26f fix:关联分账单 2026-04-23 10:46:02 +08:00
正新
18d5e9c3dd Merge #108 into master from cc_20260422_feeItemId 
fix:调增的时候校验

* cc_20260422_feeItemId: (2 commits squashed)

  - fix:调增的时候校验

  - fix:调增的时候校验

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/108
 2026-04-22 10:49:03 +00:00
suzhuhong
95e6400fa2 fix:调增的时候校验 2026-04-22 18:48:38 +08:00
正新
45766399fd Merge #107 into master from cc_20260422_feeItemId 
fix:调增的时候校验

* cc_20260422_feeItemId: (1 commits squashed)

  - fix:调增的时候校验

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/107
 2026-04-22 10:32:23 +00:00
suzhuhong
11cfdf5b90 fix:调增的时候校验 2026-04-22 18:31:59 +08:00
suzhuhong
e34ca3bdfe Merge remote-tracking branch 'origin/master' 2026-04-22 18:14:25 +08:00
suzhuhong
20c09f49d6 fix:去掉流水号不能为空 2026-04-22 18:13:49 +08:00
正新
e9f37eb71a Merge #106 into master from cc_20260422_feeItemId 
fix:垃圾代码删除

* cc_20260422_feeItemId: (3 commits squashed)

  - fix:费用类型feetId

  - fix:splitType 传入

  - fix:垃圾代码删除

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/106
 2026-04-22 09:42:12 +00:00
suzhuhong
717d4513ee fix:垃圾代码删除 2026-04-22 17:41:28 +08:00
正新
e6797ce3ff Merge #105 into master from cc_20260422_feeItemId 
fix:splitType 传入

* cc_20260422_feeItemId: (2 commits squashed)

  - fix:费用类型feetId

  - fix:splitType 传入

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/105
 2026-04-22 09:29:26 +00:00
suzhuhong
f06519532e fix:splitType 传入 2026-04-22 17:27:15 +08:00
suzhuhong
fca198a835 fix:费用类型feetId 2026-04-22 17:12:02 +08:00
suzhuhong
34d95a3e4d Merge remote-tracking branch 'origin/master' 2026-04-22 16:02:04 +08:00
suzhuhong
106f4bef46 fix:费用类型feetId 2026-04-22 16:01:39 +08:00
正新
7cc4f7e1fa Merge #104 into master from cc_20260422_zhuangxiu 
fix:redis 执行异常

* cc_20260422_zhuangxiu: (2 commits squashed)

  - fix:装修 红圈通回调调整 解除强制限制

  - fix:redis 执行异常

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/104
 2026-04-22 07:50:17 +00:00
suzhuhong
66ab8dc975 fix:redis 执行异常 2026-04-22 15:49:25 +08:00
suzhuhong
78ef7e9440 fix:装修 红圈通回调调整 解除强制限制 2026-04-22 11:11:25 +08:00