Commit Graph

956 Commits

Author SHA1 Message Date
苏竹红
bd1486c08a feat:验签调整 2025-11-21 15:18:06 +08:00
苏竹红
d74f4a5c19 feat:验签调整 2025-11-21 12:41:52 +08:00
苏竹红
ea618f0643 feat:验签改为秒 2025-11-21 10:58:39 +08:00
wangff
f53b77b657 fix 2025-11-20 18:16:18 +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
wangff
8f1182f3ee fix:钱包pc接口补充 2025-11-20 10:15:34 +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
苏竹红
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
af52a60e50 fix:小程序接口请求类型修改 2025-11-18 18:47:17 +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
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
0d882ff79a fix:账户列表、密码更新接口 2025-11-18 09:17:45 +08:00
wangff
f5283b783c fix:新增小程序账户列表及流水接口 2025-11-17 18:01:01 +08:00
苏竹红
04b5a4e7bc feat:打标回调通知接口 2025-11-17 14:14:47 +08:00
苏竹红
0646022baf feat:钱包接口对接 2025-11-15 15:11:14 +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
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
苏竹红
9f042b9dbd feat:钱包接口对接 2025-11-13 18:44:19 +08:00
wangff
7267868f16 fix:所属大区新增品牌筛选 2025-11-13 11:19:12 +08:00
wangff
13c44053c2 fix:问题修复 2025-11-13 10:40:30 +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
wangff
2e719bd15e fix:修复三明治加盟非加盟合同签约金额错误的问题 2025-11-12 14:17:41 +08:00
苏竹红
368f97774a feat:信发 2025-11-12 13:51:46 +08:00
wangff
456e778f1d fix:三明治新管家推送值修改 2025-11-11 18:39:37 +08:00
苏竹红
7f342a168d feat:OkHttpClient 2025-11-11 18:16:21 +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
a3d0f9572c fix:十二分制-奖惩规则 2025-11-07 15:12:25 +08:00
wangff
549a4fbd04 fix:补充配置 2025-11-07 14:42:39 +08:00
苏竹红
ebe5f9ac6f feat:信发 2025-11-06 11:11:33 +08:00
苏竹红
05210119f1 feat:信发 2025-11-05 17:56:16 +08:00
苏竹红
2750fffdcd feat:信发 2025-11-05 17:51:13 +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