|
|
9769aba30c
|
Merge #12 into master from cc_20251215_xinfa
feat:先更新
* cc_20251215_xinfa: (2 commits squashed)
- feat:叫号屏
- feat:先更新
Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/12
|
2025-12-15 09:42:30 +00:00 |
|
苏竹红
|
f87b1ca866
|
feat:小程序版本过低
|
2025-12-09 18:43:53 +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 '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 |
|
苏竹红
|
d7c8dd21fd
|
Merge #6 into master from cc_20251203_bugfix
feat:getPosToken
* cc_20251203_bugfix: (1 commits squashed)
- feat:getPosToken
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/6
|
2025-12-09 03:12:33 +00:00 |
|
wangff
|
08f7671427
|
fix
|
2025-12-02 19:35:17 +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 |
|
苏竹红
|
e529a36c32
|
feat:正新三明治
|
2025-12-02 18:49:50 +08:00 |
|
苏竹红
|
587800ea9d
|
feat:WALLET_API_ERROR
|
2025-12-01 15:24:12 +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 |
|
苏竹红
|
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 |
|
苏竹红
|
ea8560d14a
|
feat:短信调整
|
2025-11-27 11:14:31 +08:00 |
|
wangff
|
cebd64bf3e
|
fix:开店流程初始化临时关闭钱包阶段
|
2025-11-26 17:38:46 +08:00 |
|
wangff
|
e079a8b83c
|
fix:门店账户分页接口新增字段；打标接口完善
|
2025-11-26 10:11:08 +08:00 |
|
苏竹红
|
19376134d0
|
feat:正新
|
2025-11-25 13:50:30 +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 |
|
苏竹红
|
d74f4a5c19
|
feat:验签调整
|
2025-11-21 12:41:52 +08:00 |
|
wangff
|
fb6170833c
|
fix:新增网商是否已激活标识
|
2025-11-21 10:03:58 +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 |
|
苏竹红
|
3cbd81c696
|
feat:服务包专用
|
2025-11-19 17:22:14 +08:00 |
|
苏竹红
|
082e044b5a
|
Merge branch 'master' into cc_20251112_wallet
|
2025-11-19 16:45:05 +08:00 |
|
wangff
|
ff9be4e61b
|
fix:建店时候调用创建门店接口；流水接口新增收入支出字段；新增账户详情接口、交易详情接口
|
2025-11-19 16:23:14 +08:00 |
|
wangff
|
ac5a06bdad
|
fix:打标失败处理
|
2025-11-18 18:44:10 +08:00 |
|
苏竹红
|
9e4acf66f4
|
feat:pos pos 建店 不依赖营业证照
|
2025-11-18 14:12:33 +08:00 |
|
wangff
|
f983c8a92d
|
fix:小程序支付密码修改、充值、充值列表、提现接口
|
2025-11-18 11:29:42 +08:00 |
|
苏竹红
|
e8782b21cb
|
feat:请不要使用系统默认店名
|
2025-11-17 19:51:20 +08:00 |
|
wangff
|
17c3e1cbf3
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-17 15:52:10 +08:00 |
|
wangff
|
b2bd17e075
|
fix:阶段编码及状态修改
|
2025-11-17 15:51:54 +08:00 |
|
苏竹红
|
04b5a4e7bc
|
feat:打标回调通知接口
|
2025-11-17 14:14:47 +08:00 |
|
wangff
|
fcef86762d
|
fix:打标接口调用新增账户状态校验
|
2025-11-17 11:12:11 +08:00 |
|
wangff
|
35a1e1292a
|
fix:包修改
|
2025-11-17 10:18:32 +08:00 |
|
苏竹红
|
0646022baf
|
feat:钱包接口对接
|
2025-11-15 15:11:14 +08:00 |
|
wangff
|
7d810b2a0d
|
fix:新增钱包开通流程及相关接口
|
2025-11-14 17:02:11 +08: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
|
7536970ff8
|
fix:通知模块枚举描述修改
|
2025-11-14 10:41:45 +08:00 |
|
苏竹红
|
9f042b9dbd
|
feat:钱包接口对接
|
2025-11-13 18:44:19 +08:00 |
|
wangff
|
13c44053c2
|
fix:问题修复
|
2025-11-13 10:40:30 +08:00 |
|
苏竹红
|
c99c4375d7
|
feat:签名
|
2025-11-12 16:27:52 +08:00 |
|
wangff
|
b35903010c
|
fix:十二分制-移动端接口；PC端接口补充
|
2025-11-11 13:58:24 +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
|
9c627dd2dd
|
Merge branch 'master' into cc_20251029_smz
|
2025-11-10 10:42:07 +08:00 |
|
wangff
|
ba2fca738b
|
fix:经营模式新增联营；获取默认值接口返回收银费字段
|
2025-11-10 09:57:53 +08:00 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +08:00 |
|
苏竹红
|
f3dc39b911
|
feat:信发
|
2025-11-05 17:47:47 +08:00 |
|
wangff
|
85a411bc9a
|
fix:十二分制-奖惩规则
|
2025-11-05 15:40:31 +08:00 |
|
苏竹红
|
e10525cedd
|
feat:getStoreXinFaDeviceDetail
|
2025-11-05 10:04: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 |
|
