Commit Graph

4491 Commits

Author SHA1 Message Date
wangff
e5c59b3839 fix 2025-11-24 10:29:43 +08:00
wangff
33181f188f fix:存量门店开通网商新增身份证有效期字段 2025-11-24 10:26:57 +08:00
苏竹红
22b47c4f70 Merge branch 'cc_20251028_decoration' into 'master'
Cc 20251028 decoration

See merge request hangzhou/java/custom_zxjp!192
2025-11-21 08:39:38 +00: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
苏竹红
bd1486c08a feat:验签调整 2025-11-21 15:18:06 +08:00
wangff
e54764a065 fix:字段补充 2025-11-21 14:45:43 +08:00
苏竹红
537ecb2f61 feat:合同编号 2025-11-21 13:28:24 +08:00
苏竹红
d74f4a5c19 feat:验签调整 2025-11-21 12:41:52 +08:00
苏竹红
ea618f0643 feat:验签改为秒 2025-11-21 10:58:39 +08:00
wangff
fb6170833c fix:新增网商是否已激活标识 2025-11-21 10:03:58 +08:00
苏竹红
4db4068a77 feat:延迟4个小时 2025-11-20 18:18:06 +08:00
wangff
f53b77b657 fix 2025-11-20 18:16:18 +08:00
wangff
300bcefa72 fix 2025-11-20 17:57:37 +08:00
wangff
33b55a58b9 Merge branch 'refs/heads/master' into cc_2021104_twelve_points 2025-11-20 16:54:35 +08:00
wangff
052b0f368a fix:接口平安错误码确认 2025-11-20 16:48:57 +08:00
wangff
38a669dff9 fix:开店流程网商开通失败标识缓存;小程序账户列表返回对象修改;根据门店编码查询开通基础信息逻辑修改;网商账户提交逻辑修改;
feat:网商激活接口
2025-11-20 16:44:24 +08:00
苏竹红
4581aeb85a feat:老店提交开通 2025-11-20 15:48:31 +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
wangff
8f1182f3ee fix:钱包pc接口补充 2025-11-20 10:15:34 +08:00
苏竹红
3cbd81c696 feat:服务包专用 2025-11-19 17:22:14 +08:00
wangff
27d8f9c6fa fix:门店账户列表新增开户总行名称字段 2025-11-19 17:10:20 +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
苏竹红
2335ecca4c feat:storeId 2025-11-19 14:56:52 +08:00
苏竹红
f042431572 feat:PC接口 2025-11-19 14:51:14 +08:00
wangff
94ac7c9fbe fix:补充提交 2025-11-19 14:42:30 +08:00
wangff
088ee0a0e5 fix:打标接口针对网商改动;字段名修改;网商开通回调;大额充值回调 2025-11-19 14:41:40 +08:00
wangff
3ddf965a6c fix 2025-11-18 18:52:21 +08:00
wangff
af52a60e50 fix:小程序接口请求类型修改 2025-11-18 18:47:17 +08:00
wangff
0781a4059f Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AddTagCallbackNoticeRequest.java
2025-11-18 18:44:32 +08:00
wangff
ac5a06bdad fix:打标失败处理 2025-11-18 18:44:10 +08:00
苏竹红
f40cfb5c92 feat:网商接口 2025-11-18 18:22:50 +08:00
wangff
9ae993c248 fix:rest接口规范 2025-11-18 16:59:10 +08:00
苏竹红
7703e4ef09 feat:营账通key 2025-11-18 15:08:35 +08:00
wangff
6d6f72dbc9 fix:pc账户列表接口 2025-11-18 14:23:32 +08:00
苏竹红
9e4acf66f4 feat:pos pos 建店 不依赖营业证照 2025-11-18 14:12:33 +08:00
wangff
267bd0e7b3 Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet 2025-11-18 11:29:53 +08:00
wangff
f983c8a92d fix:小程序支付密码修改、充值、充值列表、提现接口 2025-11-18 11:29:42 +08:00
苏竹红
579bef59cd feat:优化 2025-11-18 10:28:47 +08:00
wangff
d1e045a72f fix:大额支付订单流水 2025-11-18 09:18:41 +08:00
wangff
0d882ff79a fix:账户列表、密码更新接口 2025-11-18 09:17:45 +08:00
苏竹红
e8782b21cb feat:请不要使用系统默认店名 2025-11-17 19:51:20 +08:00
wangff
f5283b783c fix:新增小程序账户列表及流水接口 2025-11-17 18:01:01 +08:00
苏竹红
1ab05c19e5 Merge branch 'cc_20251114_minor_req' into 'master'
fix:待办缴纳加盟费用列表新增加盟品牌字段

See merge request hangzhou/java/custom_zxjp!191
2025-11-17 09:43:05 +00:00
wangff
f2a18f7893 Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet 2025-11-17 15:53:23 +08:00
wangff
0e1955a5ed fix 2025-11-17 15:53:06 +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