王非凡
|
4b7a35c96c
|
Merge #18 into master from cc_20251114_minor_req
fix:订货信息新增订货备注并同步主数据；门店编码变更推送新管家
* cc_20251114_minor_req: (11 commits squashed)
- fix:门店日营销数据
- fix:jackson反序列化配置忽略未定义字段
- fix:菜品市场数据新增字段
- fix:菜品市场数据新增字段
- Merge branch 'master' into cc_20251114_minor_req
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
- fix:数据看板日营业数据字段修改
- fix:根据手机号获取门店列表 开放接口
- Merge branch 'refs/heads/master' into cc_20251114_minor_req
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
- fix:开店管理修改基本信息资料中门店编码发生变化时推送新管家
- fix:订货信息新增订货备注并同步主数据
- Merge branch 'refs/heads/master' into cc_20251114_minor_req
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/18
|
2025-12-26 08:55:27 +00:00 |
|
|
|
e97c147fac
|
Merge #17 into master from cc_20251218_opening
Merge branch 'master' into cc_20251218_opening
* cc_20251218_opening: (11 commits squashed)
- fix:信发查询bug
- fix:信发查询bug
- fix:测试
- fix:老店新开不需要开业验收
- feat:开业验收数据处理
- fix:开业验收bug修复
- fix:开业验收bug修复
- fix:云流水权限开通
- feat:开业验收数据处理
- feat:开业验收数据处理
- Merge branch 'master' into cc_20251218_opening
Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
|
2025-12-25 10:50:38 +00:00 |
|
|
|
cf5d16b822
|
Merge #13 into master from cc_20251211_jinjian
feat:进件
* cc_20251211_jinjian: (3 commits squashed)
- feat:进件
- Merge branch 'master' into cc_20251211_jinjian
- feat:进件
Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/13
|
2025-12-15 09:43:50 +00:00 |
|
王非凡
|
4be2276287
|
Merge #8 into master from cc_20250922_closeStore_w
闭店
* cc_20250922_closeStore_w: (44 commits squashed)
- feat:闭店流程init
- feat:闭店流程接口
- feat:闭店
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
- fix:闭店材料模块
- fix:账号关闭流程
- feat:闭店审批流程（未测）；字典表
- fix:闭店审批流程完善
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店流程流转补充
- feat:闭店退款
- fix:字典表接口
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店原因接口新增闭店发起方式字段
- fix:修改审批记录返回数据类型
feat:新增退款流程跳过
- fix
- fix:新增字段
- feat:新增闭店退款提交人列表接口
- fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段
- fix:新增接口返回字段
- fix:闭店管理、审批待办类别所属品牌筛选改为多选
- fix:闭店管理列表新增完成阶段数量字段
- feat:新增第三方闭店申请接口
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.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
- fix:自动发起闭店申请定时任务
- feat:火码账号关闭
- fix:闭店流程修改
- 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/ErrorCodeEnum.java
#	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 'refs/heads/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/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-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java
#	coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.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/dao/dict/SysDictColumnDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/dict/SysDictColumnMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java
#	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 |
|
苏竹红
|
1b0fb1b034
|
Merge #9 into master from cc_20251208_bank
feat:老店开通 V2
* cc_20251208_bank: (6 commits squashed)
- feat:银行的接口
- feat:银行的接口
- feat:bank
- fix:网商提交开通新增法人银行卡信息
- fix:小程序新增字典接口
- feat:老店开通 V2
Signed-off-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/9
|
2025-12-09 08:55:37 +00:00 |
|
苏竹红
|
a444130b21
|
feat:bot
|
2025-12-09 15:39:43 +08:00 |
|
王非凡
|
e57f8c7925
|
Merge #4 into master from cc_20251027_new2
fix:小程序菜单
* cc_20251027_new2: (3 commits squashed)
- feat:小程序菜单配置
- Merge branch 'refs/heads/master' into cc_20251027_new2
- 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/4
|
2025-12-04 09:48:08 +00: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 |
|
苏竹红
|
ee54802f7e
|
Merge branch 'master' into cc_20250905_franchiseAgreement
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
|
2025-12-01 10:50:32 +08:00 |
|
苏竹红
|
09ef3693a1
|
feat:门店编码查询
|
2025-11-28 16:58:23 +08:00 |
|
苏竹红
|
23eb77a317
|
feat:旗舰店
|
2025-11-28 15:40:57 +08:00 |
|
wangff
|
6ff0ed86fc
|
Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-27 16:38:50 +08:00 |
|
wangff
|
5b44fda2a9
|
fix:开店流程初始化临时关闭钱包阶段
|
2025-11-26 17:49:03 +08:00 |
|
wangff
|
e079a8b83c
|
fix:门店账户分页接口新增字段；打标接口完善
|
2025-11-26 10:11:08 +08:00 |
|
wangff
|
33181f188f
|
fix:存量门店开通网商新增身份证有效期字段
|
2025-11-24 10:26:57 +08:00 |
|
苏竹红
|
97d3e76971
|
Merge branch 'master' into cc_20251028_decoration
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-21 16:38:36 +08:00 |
|
wangff
|
33b55a58b9
|
Merge branch 'refs/heads/master' into cc_2021104_twelve_points
|
2025-11-20 16:54:35 +08:00 |
|
wangff
|
38a669dff9
|
fix:开店流程网商开通失败标识缓存；小程序账户列表返回对象修改；根据门店编码查询开通基础信息逻辑修改；网商账户提交逻辑修改；
feat:网商激活接口
|
2025-11-20 16:44:24 +08:00 |
|
苏竹红
|
546b95b6bb
|
feat:通过门店Code 查询存量客户开通基本信息
|
2025-11-20 15:39:18 +08:00 |
|
苏竹红
|
297c6e35c4
|
feat:通过门店Code 查询存量客户开通基本信息
|
2025-11-20 15:22:50 +08:00 |
|
wangff
|
4e5c228974
|
fix:十二分接口逻辑完善
|
2025-11-20 14:31:12 +08:00 |
|
苏竹红
|
082e044b5a
|
Merge branch 'master' into cc_20251112_wallet
|
2025-11-19 16:45:05 +08:00 |
|
苏竹红
|
2335ecca4c
|
feat:storeId
|
2025-11-19 14:56:52 +08:00 |
|
wangff
|
088ee0a0e5
|
fix:打标接口针对网商改动；字段名修改；网商开通回调；大额充值回调
|
2025-11-19 14:41:40 +08:00 |
|
wangff
|
f983c8a92d
|
fix:小程序支付密码修改、充值、充值列表、提现接口
|
2025-11-18 11:29:42 +08:00 |
|
wangff
|
d1e045a72f
|
fix:大额支付订单流水
|
2025-11-18 09:18:41 +08:00 |
|
wangff
|
0d882ff79a
|
fix:账户列表、密码更新接口
|
2025-11-18 09:17:45 +08:00 |
|
wangff
|
fcef86762d
|
fix:打标接口调用新增账户状态校验
|
2025-11-17 11:12:11 +08:00 |
|
苏竹红
|
2d6d2693c1
|
feat:is_delete
|
2025-11-17 10:43:47 +08:00 |
|
苏竹红
|
93f6d93305
|
Merge branch 'cc_20251029_smz' into 'master'
所属大区新增品牌筛选
See merge request hangzhou/java/custom_zxjp!190
|
2025-11-14 10:53:01 +00:00 |
|
wangff
|
9256332d11
|
Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-web/src/main/resources/application-ab.properties
# coolstore-partner-web/src/main/resources/application-test.properties
|
2025-11-14 13:13:52 +08:00 |
|
wangff
|
022169eee1
|
fix:所属大区新增品牌筛选
|
2025-11-13 11:33:13 +08:00 |
|
wangff
|
7267868f16
|
fix:所属大区新增品牌筛选
|
2025-11-13 11:19:12 +08:00 |
|
wangff
|
13c44053c2
|
fix:问题修复
|
2025-11-13 10:40:30 +08:00 |
|
wangff
|
e6e57d6304
|
fix:新建shop门店新增storeId，建店携带storeId
|
2025-11-12 18:39:52 +08:00 |
|
苏竹红
|
e092195802
|
Merge branch 'cc_20251110_bugfix' into 'master'
Cc 20251110 bugfix
See merge request hangzhou/java/custom_zxjp!187
|
2025-11-12 09:38:24 +00:00 |
|
苏竹红
|
6cb4086783
|
feat:证照同步异常处理
|
2025-11-12 13:19:30 +08:00 |
|
wangff
|
4a08933e36
|
fix:三明治不初始化营帐通开通阶段
|
2025-11-11 20:01:55 +08:00 |
|
wangff
|
1af57c5871
|
fix:三明治不初始化营帐通开通阶段
|
2025-11-11 19:42:44 +08:00 |
|
wangff
|
b35903010c
|
fix:十二分制-移动端接口；PC端接口补充
|
2025-11-11 13:58:24 +08:00 |
|
苏竹红
|
b51762dc50
|
feat:服务包专用角色
|
2025-11-10 15:58:15 +08:00 |
|
wangff
|
85de65cda6
|
fix:十二分制-积分流水
|
2025-11-10 15:12:19 +08:00 |
|
wangff
|
bd64b33ebb
|
fix:十二分制-申请单
|
2025-11-10 14:20:44 +08:00 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +08:00 |
|
wangff
|
85a411bc9a
|
fix:十二分制-奖惩规则
|
2025-11-05 15:40:31 +08:00 |
|
苏竹红
|
c9c8d6d049
|
feat:request
|
2025-11-05 10:26:56 +08:00 |
|
苏竹红
|
59519b46fa
|
feat:request
|
2025-11-05 10:10:18 +08:00 |
|
wangff
|
75a0ad4676
|
feat:十二分制-奖惩规则
|
2025-11-04 17:53:02 +08:00 |
|
wangff
|
867a45f154
|
feat:字典表
|
2025-11-04 13:22:49 +08:00 |
|
苏竹红
|
6d974b60a1
|
feat:删除团队
|
2025-11-04 09:28:38 +08:00 |
|
