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
|
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 |
|
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 |
|
苏竹红
|
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
|
67d0b7c726
|
fix:信发发布新增节目id，接口调用失败情况下抛出异常
|
2025-11-07 10:15:16 +08:00 |
|
苏竹红
|
f3dc39b911
|
feat:信发
|
2025-11-05 17:47:47 +08:00 |
|
苏竹红
|
e10525cedd
|
feat:getStoreXinFaDeviceDetail
|
2025-11-05 10:04:18 +08:00 |
|
wangff
|
248765a78b
|
fix:菜品市场菜品服务包上新接口
|
2025-11-03 16:37:28 +08:00 |
|
wangff
|
c0d76eda61
|
fix:获取云流水免登token接口处理不存在老店数据的门店
|
2025-11-03 14:57:13 +08:00 |
|
wangff
|
22e7aa07e8
|
fix:获取门店信息开放接口新增门店状态字段
|
2025-11-03 14:03:37 +08:00 |
|
苏竹红
|
d68d24a3e2
|
Merge branch 'cc_20251031_bugfix' into 'master'
feat:WechatTemplateService
See merge request hangzhou/java/custom_zxjp!180
|
2025-10-31 09:27:25 +00:00 |
|
苏竹红
|
a4764491dc
|
Merge branch 'cc_20251030_fwb' into 'master'
数据看板
See merge request hangzhou/java/custom_zxjp!179
|
2025-10-31 09:26:50 +00:00 |
|
苏竹红
|
1e1e0c6eb5
|
feat:WechatTemplateService
|
2025-10-31 15:18:26 +08:00 |
|
wangff
|
94f4b9741d
|
feat:数据看板
|
2025-10-30 13:58:58 +08:00 |
|
苏竹红
|
9a02e0ed79
|
feat:发送模板消息
|
2025-10-30 11:38:06 +08:00 |
|
苏竹红
|
4f72c20330
|
feat:发送模板消息
|
2025-10-30 11:30:48 +08:00 |
|
苏竹红
|
7cdd293952
|
feat:SPECIAL_DATE_START
|
2025-10-30 11:22:36 +08:00 |
|
苏竹红
|
3f7157f53d
|
feat:subscribe
|
2025-10-30 11:09:45 +08:00 |
|
苏竹红
|
1d2a64911b
|
feat:handleEvent
|
2025-10-30 11:06:03 +08:00 |
|
苏竹红
|
631f2a189a
|
Merge branch 'master' into cc_20251010_wxnotice
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
|
2025-10-29 19:44:14 +08:00 |
|
wangff
|
bfdd1dd079
|
fix:新增三明治流程相关字段
|
2025-10-29 19:29:42 +08:00 |
|
苏竹红
|
70263034af
|
Merge branch 'cc_20251027_new2' into 'master'
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式
See merge request hangzhou/java/custom_zxjp!177
|
2025-10-28 09:16:17 +00:00 |
|
苏竹红
|
bf80d825a8
|
feat:回调处理
|
2025-10-28 13:39:23 +08:00 |
|
苏竹红
|
b4365a795c
|
feat:appid
|
2025-10-28 10:02:43 +08:00 |
|
苏竹红
|
5e37edfd98
|
Merge branch 'cc_20251021_join' into 'master'
Cc 20251021 join
See merge request hangzhou/java/custom_zxjp!176
|
2025-10-27 09:06:14 +00:00 |
|
wangff
|
f784b895cf
|
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式
|
2025-10-27 16:46:18 +08:00 |
|
苏竹红
|
80d3f6efd0
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 15:43:21 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +08:00 |
|
wangff
|
0741e41c69
|
fix:信管家数据推送门店名称修改
|
2025-10-24 16:10:10 +08:00 |
|
wangff
|
e1a1cb5616
|
fix:POS开通资料收集中转资料审核中条件修改
|
2025-10-24 14:53:24 +08:00 |
|
wangff
|
e8d0006dcb
|
fix:POS及营帐通开通流程修改
|
2025-10-24 14:08:57 +08:00 |
|
苏竹红
|
000d9e8111
|
Merge branch 'cc_20250903_big_screen' into 'master'
fix:补充遗失代码
See merge request hangzhou/java/custom_zxjp!173
|
2025-10-23 10:31:05 +00:00 |
|
wangff
|
7c44ec246e
|
fix:补充遗失代码
|
2025-10-22 16:50:31 +08:00 |
|
苏竹红
|
1203b8acf3
|
Merge branch 'master' into cc_20251016_async
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/executor/MdcTaskExecutor.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
|
2025-10-16 17:29:07 +08:00 |
|
苏竹红
|
7b88d3bec9
|
feat:服务号通知异常处理
|
2025-10-16 16:31:45 +08:00 |
|