王非凡
|
567ff3536f
|
Merge #149 into master from cc_20260408_close_up_v2
fix:歇业管理优化
* cc_20260408_close_up_v2: (37 commits squashed)
- fix:歇业管理（部分）
- fix:歇业管理（部分）
- fix:审批逻辑修改；拒绝审批实现
- fix:恢复开业申请及审批
- fix:主流程补充
- fix:主流程补充
- fix:字段补充及逻辑修改
- fix:字段补充
- fix
- fix:平台处理新增字段
- fix
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件；审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- fix:歇业对接三方平台
- fix:歇业对接三方平台
- fix:日志
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:火码平台账号处理状态初始化为已处理
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'master' into cc_20260408_close_up
- fix:火码歇业时机修改
- fix
- fix:平台关闭开启处理自动发起三方调用
- Merge branch 'master' into cc_20260408_close_up_v2
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:平台关闭开启时调用三方平台接口
- fix:修复自动关闭三方平台状态更新失败的问题
- Merge branch 'refs/heads/master' into cc_20260408_close_up_v2
- fix:修复三方门店歇业失败时POS待办不更新的问题
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/149
|
2026-05-26 09:21:02 +00:00 |
|
suzhuhong
|
5e8cb275fe
|
fix:培训登记
|
2026-05-21 17:55:57 +08:00 |
|
suzhuhong
|
df356c3aa6
|
fix:流程处理人
|
2026-05-21 15:23:34 +08:00 |
|
王非凡
|
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 |
|
王非凡
|
41e6b3ccfe
|
Merge #142 into master from cc_20260515_audio_ge
音频生成
* cc_20260515_audio_ge: (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/142
|
2026-05-19 10:23:43 +00:00 |
|
王非凡
|
e6bcfac086
|
Merge #140 into master from cc_20260513_minor_req
闭店H5新增闭店接口&私域二维码缓存时间延长
* cc_20260513_minor_req: (2 commits squashed)
- fix:私域二维码新增SN反向映射关系
- fix:新增pc闭店申请发起接口
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/140
|
2026-05-18 09:30:59 +00:00 |
|
正新
|
150b709b74
|
Merge #136 into master from cc_20260508_adjustment
feat:费用单费用调整单合并
* cc_20260508_adjustment: (20 commits squashed)
- feat:费用单调整
- feat:费用调整
- feat:新增审批
- feat:费用调整单
- feat:调整单
- feat:自动分账
- feat:填写添加门店
- feat:流水查询条件
- Merge branch 'master' into cc_20260508_adjustment
- feat：费用流水筛选条件
- feat：getAdjustAmount
- feat:提现申请单导出
- feat:提现申请单导出 状态
- feat:提现申请单导出 状态
- Merge branch 'cc_20260513_withdrawApplication_export' into cc_20260508_adjustment
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithdrawApplicationDTO.java
- 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/136
|
2026-05-13 08:50:21 +00:00 |
|
正新
|
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 |
|
正新
|
20f063dc55
|
Merge #128 into master from cc_20250512_uploadRentContract
feat:租赁合同新增审批记录
* cc_20250512_uploadRentContract: (100 commits squashed)
- fix:计划闭店时间修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat：新签调整
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat：招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- feat：招商
- feat：招商
- feat：招商
- fix:删除字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat：招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat：数据同步 名称新增MX 等前缀
- feat：上海魔盒未来食品有限公司
- fix:修改查询逻辑
- Merge branch 'cc_20260428_store_report' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat：id
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'cc_20260507_smz' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat：翻新
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:RenewalRenovateApprovalVO
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:招商副总裁
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
- feat:招商副总裁审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用单调整
- feat:招商经理
- feat:招商经理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用调整
- Merge branch 'master' into cc_20260226_fix
- fix:bug修复
- fix:未开业门店试营业日期
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:新增审批
- fix:开业日期报备不同步门店状态
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- fix:字段名称修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- fix:闭店中止新增审批记录
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:费用调整单
- feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:调整单
- feat:SHOP_SUB_STAGE_STATUS_150_5
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- fix:试营业测试接口
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'master' into cc_20250514_common_bak
- feat:page
- feat:自动分账
- Merge branch 'master' into cc_20250514_common_bak
- fix:私域二维码门店绑定关系缓存改为7天
- Merge branch 'cc_20260226_fix' into cc_20250514_common_bak
- feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询
- Merge branch 'cc_20260509_fix' into cc_20250514_common_bak
- fix:修改门店开业日期判断条件修改
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- feat:填写添加门店
- feat:建店代办处理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat:userAuthMappingService
- feat:addShopDecorationLog
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:待采购确认 审批流程
- feat:问题修复
- Merge branch 'cc_20260511_fix' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:问题修复
- feat:问题修复
- feat:流水查询条件
- Merge branch 'master' into cc_20260508_adjustment
- feat：费用流水筛选条件
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat：getAdjustAmount
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:合并冲突
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- Merge branch 'master' into cc_20260408_close_up
- fix:火码歇业时机修改
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
- feat:租赁合同新增审批记录
- Merge branch 'master' into cc_20250512_uploadRentContract
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	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 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件；审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- fix:歇业对接三方平台
- fix:歇业对接三方平台
- fix:日志
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:火码平台账号处理状态初始化为已处理
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'master' 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 |
|
正新
|
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 'master' into cc_20260511_fix
# Conflicts:
#	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 |
|
王非凡
|
a42a109b6c
|
Merge #120 into master from cc_20250922_closeStore_w
fix:闭店中止新增审批记录
* cc_20250922_closeStore_w: (100 commits squashed)
- fix:新管家应退实退金额字段修改
- fix:启用禁用规则合并
- Merge branch 'refs/heads/master' 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 'master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
- fix:新增字段
- fix:字段补充
- fix:小程序新增接口根据闭店申请id获取闭店申请简单信息
- fix:小程序退款信息列表修改
- fix:闭店审批允许管理员审批
- fix:字典项新增排序、编辑删除权限、关联字典项
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分值-扣分列表申请复议截止日期格式
- fix:去除appealEndDate格式校验
- Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2
- fix:阶段名称修改
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java
- fix:闭店记录列表补充审批id；仅在营门店允许发起闭店
- fix:提交新管家字段取值逻辑修改
- Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points
- fix:字典回显包含已删除字典项
- Merge branch 'master' into cc_2021104_twelve_points
- Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points
- fix:去除惩处单审批阶段；复议申请单证明图片非必填
- fix:复议拒绝后惩处单直接生效
- fix:扣分申请单证明图片改为非必填
- fix
- fix:字段转义
- fix:惩处待处理包含带生效数据
- fix:字段转义
- fix:警告单金额和积分初始化为0
- fix
- fix:小程序接口字段转义
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分审批记录展示待审批人
- fix
- fix:惩处单复议申请逾期检查改为延时队列
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
- fix:闭店定时任务过滤闭店状态补充
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店材料新增字段
- fix
- fix:小程序闭店材料详情新增字段
- fix:闭店流程流转校验除授权书外是否已邮寄
- fix:营帐通JWT生成
- fix:营帐通JWT改为post
- fix:修改secret
- fix:配置
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分流水导出；流水新增规则描述字段
- fix
- fix:闭店新管家接口错误信息返回
- Merge branch 'master' into cc_20250922_closeStore_w
- Merge branch 'cc_20260412_jwt_ge' into cc_20250922_closeStore_w
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店火码关闭账号不存在时忽略
- Merge branch 'cc_2021104_twelve_points' into cc_20250922_closeStore_w
- Merge branch 'master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
- fix:闭店逻辑修改
- fix:闭店待办列表新增字段
- fix:计划闭店时间修改
- fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段
- fix:删除字段
- fix:字段名称修改
- fix:闭店中止新增审批记录
- Merge branch 'master' into cc_20250922_closeStore_w
# Conflicts:
#	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 |
|
正新
|
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 |
|
王非凡
|
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 'master' 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
|
449f409522
|
feat：导出
|
2026-04-24 18:15:25 +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
|
106f4bef46
|
fix:费用类型feetId
|
2026-04-22 16:01:39 +08:00 |
|
suzhuhong
|
7c64c5d3d5
|
feat:费用类型
|
2026-04-21 17:28:34 +08:00 |
|
suzhuhong
|
acd1323afa
|
Merge branch 'cc_20260415_trans'
|
2026-04-20 16:43:02 +08:00 |
|
suzhuhong
|
39d6b0662b
|
Merge branch 'master' into cc_20260415_trans
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
|
2026-04-17 16:59:14 +08:00 |
|
王非凡
|
8c4f55ab20
|
Merge #102 into master from cc_20260414_invoice
开票管理
* cc_20260414_invoice: (6 commits squashed)
- fix:门店开票信息
- fix:新增企业开票校验接口；闭店列表新增筛选条件
- fix
- Merge branch 'master' into cc_20260414_invoice
- Merge remote-tracking branch 'origin/cc_20260414_invoice' into cc_20260414_invoice
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- Merge branch 'master' into cc_20260414_invoice
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.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/102
|
2026-04-17 08:53:50 +00:00 |
|
suzhuhong
|
2caabe3fe1
|
feat:分账门店映射
|
2026-04-17 16:03:56 +08:00 |
|
suzhuhong
|
5ccfbc96d7
|
feat:分账
|
2026-04-16 18:25:22 +08:00 |
|
suzhuhong
|
d90f8eb2a8
|
feat:独立分账
|
2026-04-16 11:03:52 +08:00 |
|
suzhuhong
|
fa83eeb484
|
feat:trans
|
2026-04-15 18:02:18 +08: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 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件；审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	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 |
|
王非凡
|
2b4ff26428
|
Merge #96 into master from cc_20250922_closeStore_w
闭店火码账号关闭优化；十二分积分流水导出
* cc_20250922_closeStore_w: (100 commits squashed)
- fix:支行列表接口
- fix:错误信息修改
- Merge branch 'master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:闭店材料详情接口新增字段
- fix:闭店材料修改单个材料时，去除审批状态
- Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w
- fix:闭店材料详情接口新增模板链接字段
- fix:闭店材料详情新增材料状态转义字段
- Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w
- fix:新管家应退实退金额字段修改
- fix:启用禁用规则合并
- Merge branch 'refs/heads/master' 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 'master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
- fix:新增字段
- fix:字段补充
- fix:小程序新增接口根据闭店申请id获取闭店申请简单信息
- fix:小程序退款信息列表修改
- fix:闭店审批允许管理员审批
- fix:字典项新增排序、编辑删除权限、关联字典项
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分值-扣分列表申请复议截止日期格式
- fix:去除appealEndDate格式校验
- Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2
- fix:阶段名称修改
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java
- fix:闭店记录列表补充审批id；仅在营门店允许发起闭店
- fix:提交新管家字段取值逻辑修改
- Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points
- fix:字典回显包含已删除字典项
- Merge branch 'master' into cc_2021104_twelve_points
- Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points
- fix:去除惩处单审批阶段；复议申请单证明图片非必填
- fix:复议拒绝后惩处单直接生效
- fix:扣分申请单证明图片改为非必填
- fix
- fix:字段转义
- fix:惩处待处理包含带生效数据
- fix:字段转义
- fix:警告单金额和积分初始化为0
- fix
- fix:小程序接口字段转义
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分审批记录展示待审批人
- fix
- fix:惩处单复议申请逾期检查改为延时队列
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
- fix:闭店定时任务过滤闭店状态补充
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店材料新增字段
- fix
- fix:小程序闭店材料详情新增字段
- fix:闭店流程流转校验除授权书外是否已邮寄
- fix:营帐通JWT生成
- fix:营帐通JWT改为post
- fix:修改secret
- fix:配置
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分流水导出；流水新增规则描述字段
- fix
- fix:闭店新管家接口错误信息返回
- Merge branch 'master' into cc_20250922_closeStore_w
- Merge branch 'cc_20260412_jwt_ge' into cc_20250922_closeStore_w
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店火码关闭账号不存在时忽略
- Merge branch 'cc_2021104_twelve_points' into cc_20250922_closeStore_w
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/96
|
2026-04-14 09:55:15 +00:00 |
|
正新
|
1bbb6f7097
|
Merge #98 into master from cc_20260408_trans
feat:mock 处理
* cc_20260408_trans: (22 commits squashed)
- feat：分账
- feat：分账接口
- feat：分账单管理
- feat：分账管理
- feat：分账管理
- feat：userIdName
- feat：提现
- feat：调整
- feat：accountName
- feat：accountName
- feat：mock
- feat：关联门店
- feat：待充值待认款
- feat：待充值待认款
- feat：payer_account_no
- feat：payeeAccountName
- feat：payeeAccountNo
- feat：page
- feat：枚举
- feat：接口请求方式调整get->post
- feat:mock 处理
- Merge branch 'master' into cc_20260408_trans
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.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/98
|
2026-04-14 09:55:00 +00:00 |
|
正新
|
1381af4eec
|
Merge #93 into master from cc_20260413_fix
feat：ai店限制
* cc_20260413_fix: (2 commits squashed)
- 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/93
|
2026-04-13 09:27:43 +00:00 |
|
正新
|
1a77d8fc37
|
Merge #91 into master from cc_20230331_device
feat：添加阶段状态
* cc_20230331_device: (21 commits squashed)
- feat：添加采购审批
- Merge branch 'master' into cc_20230331_device
- feat：设备发货阶段
- feat：设备发货
- feat：设备发货
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：接口调整
- feat：查询订单设备明细
- feat：测试
- feat：短信模板切换
- feat：getPendingList
- feat：代办调整
- feat：处理人
- feat：添加阶段状态
- Merge branch 'master' into cc_20230331_device
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.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/91
|
2026-04-12 09:16:48 +00:00 |
|
正新
|
77ca18b6fc
|
Merge #90 into master from cc_20260407_bzj
feat：时间处理
* cc_20260407_bzj: (3 commits squashed)
- 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/90
|
2026-04-08 11:41:54 +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 'refs/heads/cc_20260302_debounce' 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 |
|
王非凡
|
5ff5673914
|
Merge #89 into master from cc_20260402_minor_req
fix:诸多小需求
* cc_20260402_minor_req: (6 commits squashed)
- fix:PC端新增租赁合同相关接口
- 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/89
|
2026-04-08 10:44:03 +00:00 |
|
正新
|
6f34da2fb4
|
Merge #86 into master from cc_20260401_bugfix
feat：接口调整
* cc_20260401_bugfix: (5 commits squashed)
- feat：推送数据
- feat：装修团队
- feat：开始时间为空
- feat：接口调整
- Merge branch 'master' into cc_20260401_bugfix
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.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/86
|
2026-04-02 09:13:29 +00:00 |
|
正新
|
310ae0be7d
|
Merge #81 into master from cc_20260320_standard_expense_Type
feat：时间调整
* cc_20260320_standard_expense_Type: (40 commits squashed)
- feat：费用类型新增
- feat：费用类型
- feat：默认数据
- feat：类型调整
- Merge branch 'master' into cc_20260320_standard_expense_Type
- feat：逻辑调整
- Merge branch 'master' into cc_20260320_standard_expense_Type
- feat：逻辑调整-标准店
- feat：逻辑调整-标准店
- feat：逻辑调整-标准店
- feat：逻辑调整-标准店
- feat：查询预分账调整
- feat：查询预分账调整
- feat：心愿单 校验调整
- feat：心愿单 校验调整
- feat：心愿单 金额校验调整
- feat：心愿单 金额校验调整
- feat：心愿单 金额校验调整
- feat：先推送账单 再推送
- feat：先推送账单 再推送
- feat：先推送账单 再推送
- feat：先推送账单 再推送
- feat：先推送账单 再推送
- feat：先推送账单 再推送 优化推送 当系统使用费为零的时候 推送数据重置的问题
- Merge branch 'master' into cc_20260320_standard_expense_Type
- feat：接口新增字段
- feat：接口新增字段
- feat：接口新增字段
- feat：接口新增字段
- feat：接口新增字段
- feat：接口新增字段
- feat：数据调整
- feat：新增系统服务费
- feat：新增系统服务费 319
- feat：新增系统服务费 319
- feat：新增系统服务费 319
- 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/81
|
2026-03-30 13:20:15 +00:00 |
|
王非凡
|
d03bdb7cb0
|
Merge #80 into master from cc_20260330_fix
fix:新管家支行接口路径修改
* cc_20260330_fix: (6 commits squashed)
- fix:日志
- fix:问题修复
- fix:闭店二级审批改为运营片区总顾问
- fix:在营和暂停营业允许发起闭店
- fix:新管家支行接口路径修改
- Merge branch 'master' into cc_20260330_fix
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.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/80
|
2026-03-30 10:29:11 +00:00 |
|
suzhuhong
|
00fa065606
|
feat：门店经纬度更新
|
2026-03-29 18:00:36 +08:00 |
|
suzhuhong
|
89f3d453aa
|
feat：门店经纬度更新
|
2026-03-29 17:48:50 +08:00 |
|
suzhuhong
|
68ce9faf5e
|
feat：门店经纬度更新
|
2026-03-29 17:32:38 +08:00 |
|
suzhuhong
|
6ed1c893c6
|
feat：门店经纬度更新
|
2026-03-29 17:26:16 +08: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 |
|
正新
|
a13ba2175c
|
Merge #71 into master from cc_20260318_wishlist
feat：订单待确认 审批流去掉
* cc_20260318_wishlist: (22 commits squashed)
- feat：心愿单接口
- feat：心愿单接口
- feat：心愿单接口
- feat：心愿单接口 查询当前门店铺位绑定的心愿单
- feat：心愿单接口 状态
- feat：心愿单接口 状态
- feat：心愿单接口 状态
- feat：心愿单接口 状态
- Merge branch 'master' into cc_20260318_wishlist
- feat：代码merge 错误处理
- feat：新增storeType
- feat：查询逻辑调整
- feat：新增use_ai 赛选
- feat：新增use_ai 赛选
- feat：新增use_ai 赛选
- feat：心愿单状态筛选
- feat：查询当前门店铺位绑定的心愿单 mini
- feat：bug修复
- 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/71
|
2026-03-23 11:51:20 +00:00 |
|
王非凡
|
728bd0f8ef
|
Merge #68 into master from cc_20260313_ws_wallet
网商钱包分账对接
* cc_20260313_ws_wallet: (9 commits squashed)
- fix:新店开通网商钱包
- fix:网商钱包开通回调修改
- fix
- fix
- fix:关闭网商开通回调接口验签
- Merge branch 'master' into cc_20260313_ws_wallet
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java
- 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/68
|
2026-03-23 09:00:24 +00:00 |
|
王非凡
|
70b41d6783
|
Merge #62 into master from cc_20260313_ws_wallet
网商
* cc_20260313_ws_wallet: (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/62
|
2026-03-13 14:28:55 +00:00 |
|
王非凡
|
3b8ed0a3b8
|
Merge #59 into master from cc_2021104_twelve_points
fix:十二分问题修复
* cc_2021104_twelve_points: (58 commits squashed)
- fix:启用禁用规则合并
- Merge branch 'refs/heads/master' 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 'master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
- fix:字典项新增排序、编辑删除权限、关联字典项
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分值-扣分列表申请复议截止日期格式
- fix:去除appealEndDate格式校验
- Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2
- Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points
- fix:字典回显包含已删除字典项
- Merge branch 'master' into cc_2021104_twelve_points
- Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points
- fix:去除惩处单审批阶段；复议申请单证明图片非必填
- fix:复议拒绝后惩处单直接生效
- fix:扣分申请单证明图片改为非必填
- fix
- fix:字段转义
- fix:惩处待处理包含带生效数据
- fix:字段转义
- fix:警告单金额和积分初始化为0
- fix
- fix:小程序接口字段转义
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分审批记录展示待审批人
- fix
- fix:惩处单复议申请逾期检查改为延时队列
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.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/59
|
2026-03-12 09:29:50 +00:00 |
|
王非凡
|
b9690590bf
|
Merge #55 into master from cc_20260311_optimize
fix:线下收款银行配置默认值；钱包账户别名修改
* cc_20260311_optimize: (5 commits squashed)
- fix:未分配招商区域处理
- fix
- fix:线下收款银行配置默认值
- Merge branch 'master' into cc_20260311_optimize
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.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/55
|
2026-03-11 09:51:45 +00:00 |
|
正新
|
489d72f06f
|
Merge #52 into master from cc_20260121_store_type
Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
* cc_20260121_store_type: (100 commits squashed)
- Merge branch 'master' into cc_20251208_visit
- feat:订单列表
- feat:订单列表
- fix:拜访记录导出
- feat:列表处理
- Merge branch 'cc_20251208_visit' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- fix:加盟缴费调整
- feat:标准店接口处理
- fix:加盟缴费调整
- Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java
- feat:冲突解决
- feat:接口处理
- feat:shopInfo
- fix:PC缴费信息列表过滤已完成缴费信息
- fix:测试接口修改
- Merge branch 'refs/heads/cc_20260126_pingan_wallet' into cc_20260121_store_type
- fix:测试接口修改
- feat:接口
- feat:接口调整
- feat:注释调整
- feat：key 调整
- feat：订单ID
- feat：日志打印
- feat：选择标准店型
- feat:useStandardStore
- feat:标准店没有缴费阶段
- feat:标准店没有缴费阶段
- feat:标准店没有缴费阶段
- feat:标准店没有缴费阶段
- feat:阶段调整
- fix:修复加盟缴费流程流转错误
- feat:费用类型ID
- feat:锁释放
- feat:分账状态
- fix:加盟签约合同数据补充
- feat:排序
- feat:选项单位
- feat:选项单位
- feat:选项单位
- feat:选项单位
- feat:option_unit
- feat:option_unit
- feat:更新调整
- feat:视频非必填
- feat:optionUnit
- fix:转义
- Merge branch 'master' into cc_20260126_pingan_wallet
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- feat:同一配置项下只能设置一个默认选项
- feat:数量支持小数，新增首次订货字段
- fix:提交及修改校验合计缴费金额和分账总金额是否相同
- feat：queryPage
- feat：defaultQuantity 改为 BigDecimal
- feat：defaultQuantity 改为 BigDecimal
- feat：门店预约到店
- feat：门店预约到店 取消预约
- feat：门店预约到店 手机号
- feat：添加原价
- feat：添加原价
- feat：添加原价
- feat：字典表 remark
- Merge branch 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
- feat：字典表 remark
- feat：服务人员手机号
- feat：价格计算调整店型优惠价*默认数量 + 原价 *（选择数量-默认数量）
- fix:补充钱包账单推送新管家流程
- fix:账单推送钱包支付类型payWay由1改为2
- feat：同一配置项下只能设置一个默认选项 限制去掉
- fix:平安钱包分账信息改为非必填
- feat：同一配置项只能选择一个选项 限制去掉
- feat：心愿单
- feat：心愿单
- feat：心愿单接口调整
- feat：心愿单接口调整
- feat：心愿单接口调整
- feat：批量更新数据
- feat：查询店型已配置的选项绑定 新增顶部预览图
- feat：查询店型已配置的选项绑定 新增顶部预览图
- feat：查询店型已配置的选项绑定 新增顶部预览图
- feat：配置大类
- feat：配置大类
- feat：价格优化
- feat：阶段审批处理
- fix:删除设计费-立规
- feat：配置大项 配置项接口改造
- feat：配置大项 配置项接口改造
- feat：handleAudit
- feat：新增code
- feat：categoryId
- feat：心愿单接口更新
- feat：心愿单接口更新
- feat：心愿单接口更新
- feat：心愿单接口更新
- feat：心愿单接口更新
- Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- Merge branch 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.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/52
|
2026-03-10 14:13:03 +00:00 |
|