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 |
|
苏竹红
|
7703e4ef09
|
feat:营账通key
|
2025-11-18 15:08:35 +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
|
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 |
|
苏竹红
|
04b5a4e7bc
|
feat:打标回调通知接口
|
2025-11-17 14:14:47 +08:00 |
|
wangff
|
f499d1827b
|
fix:待办缴纳加盟费用列表新增加盟品牌字段
|
2025-11-17 13:17:23 +08:00 |
|
wangff
|
fcef86762d
|
fix:打标接口调用新增账户状态校验
|
2025-11-17 11:12:11 +08:00 |
|
wangff
|
387e20873e
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-17 10:06:44 +08:00 |
|
wangff
|
026dab78ff
|
fix
|
2025-11-17 10:06:36 +08:00 |
|
苏竹红
|
aedea2dc59
|
feat:钱包接口对接
|
2025-11-17 09:40:57 +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 |
|
苏竹红
|
3bf7a909a1
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-13 18:44:31 +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 |
|
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 |
|
苏竹红
|
23efaf8450
|
feat:10秒
|
2025-11-12 16:29:57 +08:00 |
|
wangff
|
2e719bd15e
|
fix:修复三明治加盟非加盟合同签约金额错误的问题
|
2025-11-12 14:17:41 +08:00 |
|
苏竹红
|
9d00b92cc5
|
feat:老店转加盟
|
2025-11-12 13:29:54 +08:00 |
|
wangff
|
1af57c5871
|
fix:三明治不初始化营帐通开通阶段
|
2025-11-11 19:42:44 +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
|
2dfff50138
|
fix:推送缴费单数据到新管家新增加盟品牌字段
|
2025-11-11 15:54:20 +08:00 |
|
wangff
|
18d118d326
|
fix:三明治铺位审批通过后将详细地址写入门店信息表
|
2025-11-11 15:20:07 +08:00 |
|
wangff
|
1eb09a9380
|
fix:推送到新管家参数新增加盟品牌；合计金额计算错误问题修改
|
2025-11-11 14:59:41 +08:00 |
|
wangff
|
e5acef3899
|
Merge branch 'master' into cc_20251029_smz
|
2025-11-11 14:56:27 +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 |
|
苏竹红
|
360328eba8
|
feat:getShopId
|
2025-11-10 13:28:19 +08:00 |
|
苏竹红
|
3ebea6476e
|
feat:信发
|
2025-11-10 13:25:13 +08:00 |
|
wangff
|
9c627dd2dd
|
Merge branch 'master' into cc_20251029_smz
|
2025-11-10 10:42:07 +08:00 |
|
wangff
|
268665d12e
|
fix:收银费大写字段
|
2025-11-10 10:31:02 +08:00 |
|
wangff
|
ba2fca738b
|
fix:经营模式新增联营；获取默认值接口返回收银费字段
|
2025-11-10 09:57:53 +08:00 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +08:00 |
|
wangff
|
67d0b7c726
|
fix:信发发布新增节目id，接口调用失败情况下抛出异常
|
2025-11-07 10:15:16 +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 |
|