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

49 Commits

Author SHA1 Message Date
王非凡
3e227cc5fb Merge #144 into master from cc_20260520_unify_merge 
0520需求汇总

* cc_20260520_unify_merge: (22 commits squashed)

  - fix:正新鸡排信发自动开通改造

  - fix:环境配置

  - fix

  - fix:信发门店设备信息接口入参修改

  - fix:信发门店设备信息接口入参修改

  - fix:新增根据门店id查询设备接口

  - fix

  - fix:限制设备数量

  - fix:问题修复

  - fix:网点信息获取转义；网点/设备创建异常抛出

  - fix:更新开业报备流程完成日期、首次在营业状态时间

  - fix

  - fix:云流水&新管家账号关闭接口传入闭店原因；新增闭店原因违约闭店

  - fix:闭店信息新增字段

  - Merge branch 'master' into cc_20260518_store_date

  - fix:开店流程完成状态判断排除食安阶段

  - fix

  - fix

  - Merge branch 'cc_20260514_xinfa_modify' into cc_20260520_unify_merge
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - Merge branch 'cc_20260518_store_date' into cc_20260520_unify_merge

  - Merge branch 'cc_20260520_close_store_optimize' into cc_20260520_unify_merge

  - Merge remote-tracking branch 'origin/cc_20260518_close_reason' into cc_20260520_unify_merge

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/144
 2026-05-20 08:44:35 +00:00
正新
8caf3b1a6a Merge #132 into master from revert-56b85c33-20f063dc 
Revert commit &quot;Merge #128 into master from cc_20250512_uploadRentContract

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

  - Revert commit &quot;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
正新
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
王非凡
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
王非凡
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
正新
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
王非凡
19bce915ac Merge #99 into master from cc_20260408_close_up 
feat:歇业管理

* cc_20260408_close_up: (18 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

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/99
 2026-04-15 08:23:40 +00:00
王非凡
68cef4b83a Merge #88 into master from cc_20260401_private_sphere_qr 
fix:私域二维码

* cc_20260401_private_sphere_qr: (3 commits squashed)

  - fix:新增防抖

  - Merge branch &#39;refs/heads/cc_20260302_debounce&#39; into cc_20260401_private_sphere_qr

  - 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/88
 2026-04-08 10:44:13 +00:00
suzhuhong
7ad6cc71bb feat：门店经纬度更新 2026-03-29 18:19:57 +08:00
正新
cd49e78f3d Merge #77 into master from cc_20260329_fix 
feat：门店经纬度更新

* cc_20260329_fix: (3 commits squashed)

  - feat：门店经纬度更新

  - feat：门店经纬度更新

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

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/77
 2026-03-29 09:15:36 +00:00
正新
e49e8d4fc3 Merge #76 into master from cc_20260329_fix 
feat：门店经纬度更新

* cc_20260329_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/76
 2026-03-29 09:08:21 +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
王非凡
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
suzhuhong
2eaa1533c2 fix:店-招商经理关系 2026-01-02 11:54:49 +08:00
王非凡
4be2276287 Merge #8 into master from cc_20250922_closeStore_w 
闭店

* cc_20250922_closeStore_w: (44 commits squashed)

  - feat:闭店流程init

  - feat:闭店流程接口

  - feat:闭店

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

  - fix:闭店材料模块

  - fix:账号关闭流程

  - feat:闭店审批流程（未测）；字典表

  - fix:闭店审批流程完善

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

  - fix:闭店流程流转补充

  - feat:闭店退款

  - fix:字典表接口

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

  - fix:闭店原因接口新增闭店发起方式字段

  - fix:修改审批记录返回数据类型
    feat:新增退款流程跳过

  - fix

  - fix:新增字段

  - feat:新增闭店退款提交人列表接口

  - fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段

  - fix:新增接口返回字段

  - fix:闭店管理、审批待办类别所属品牌筛选改为多选

  - fix:闭店管理列表新增完成阶段数量字段

  - feat:新增第三方闭店申请接口

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.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

  - fix:自动发起闭店申请定时任务

  - feat:火码账号关闭

  - fix:闭店流程修改

  - 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/ErrorCodeEnum.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

  - fix:删除云流水发起闭店接口

  - fix:取消闭店申请入参修改

  - fix:闭店申请列表赋值异常问题

  - fix:闭店审批通过异常

  - fix:普通方法参数校验

  - fix:账号关闭时校验阶段状态

  - fix:初始化

  - fix:字段新增

  - fix:接口补充

  - fix

  - Merge branch &#39;refs/heads/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/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-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.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/dao/dict/SysDictColumnDAO.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/dict/SysDictColumnMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:闭店流程修改

  - fix:闭店流程修改

  - fix:修改三方付款状态接口

  - fix:闭店申请测试接口

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/8
 2025-12-09 08:55:47 +00:00
苏竹红
a444130b21 feat:bot 2025-12-09 15:39:43 +08:00
wangff
1cbd411598 Merge branch 'refs/heads/master' into cc_2021104_twelve_points 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
 2025-12-02 19:34:14 +08:00
苏竹红
09ef3693a1 feat:门店编码查询 2025-11-28 16:58:23 +08:00
wangff
a3d0f9572c fix:十二分制-奖惩规则 2025-11-07 15:12:25 +08:00
wangff
1830e2240e fix:最新订货时间定时任务过滤门店状态 2025-10-27 13:46:48 +08:00
wangff
b2076cc6c5 feat:门店最近订货时间定时任务 2025-10-27 13:32:23 +08:00
苏竹红
4b9e546ffb feat:所属大区 2025-10-08 09:51:00 +08:00
苏竹红
9217f69237 feat:getPOSToken 2025-10-05 16:39:56 +08:00
苏竹红
5c353d4de8 feat:store_master_signer_info 2025-09-24 10:06:15 +08:00
wangff
eb53fe9d2d Merge branch 'master' into cc_20250905_storeExtendInfo 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
 2025-09-23 14:11:42 +08:00
wangff
b5984f2e01 fix:获取门店信息开放接口新增收货信息字段 2025-09-18 14:22:44 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
苏竹红
5c0bf74249 feat:listByMobile 改造 2025-09-12 10:50:08 +08:00
苏竹红
910efd055d feat:getStoreListByMobile 2025-09-05 15:51:21 +08:00
苏竹红
5f7109e48b feat:菜品市场门店接口 2025-09-02 10:30:52 +08:00
苏竹红
ba90fca7fe feat：事项 2025-07-25 17:12:06 +08:00
苏竹红
1b88d4e15a feat：接口调整 2025-07-23 09:48:47 +08:00
苏竹红
6fad009386 feat：门店人员 2025-07-22 15:57:39 +08:00
shuo.wang
070b8f0b8a 增加store校验 2025-07-15 11:05:30 +08:00
shuo.wang
55abe7db99 成功开店代码改造 2025-07-03 11:33:26 +08:00
shuo.wang
285cec6bc7 成功开店代码改造 2025-07-02 18:34:04 +08:00
shuo.wang
04a29c03cc 成功开店代码改造 2025-07-02 18:24:30 +08:00
shuo.wang
cb69bef277 成功开店代码改造 2025-07-02 17:53:46 +08:00
苏竹红
8b94e49334 feat：成功开店 2025-07-02 17:12:16 +08:00
苏竹红
81fee5d4d5 feat:askbot 门店获取方式变更 2025-05-13 14:58:36 +08:00
苏竹红
b15c9eed79 feat:askbot 门店获取方式变更 2025-05-12 10:38:19 +08:00
bianyadong
3f226b109e 短信、通知以及建店完成更新用户数据 2024-05-10 19:05:20 +08:00
bianyadong
7298997b76 培训添加返回值 2024-05-09 10:34:14 +08:00
wangxiaopeng
01c84aace6 门店 2024-03-11 11:44:52 +08:00
zhangchenbiao
7a78f59ad7 update 2023-06-06 09:43:31 +08:00
zhangchenbiao
0576ed223a 企业同步 2023-06-05 11:34:44 +08:00
zhangchenbiao
b00a91d060 add 2023-05-31 15:36:45 +08:00