Commit Graph

2860 Commits

Author SHA1 Message Date
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
wangff
75a0ad4676 feat:十二分制-奖惩规则 2025-11-04 17:53:02 +08:00
wangff
867a45f154 feat:字典表 2025-11-04 13:22:49 +08:00
wangff
248765a78b fix:菜品市场菜品服务包上新接口 2025-11-03 16:37:28 +08:00
苏竹红
0c3e3048ef feat:handleDecorationTeam 2025-11-03 16:17:08 +08:00
苏竹红
ddaa9bd1fe feat:handleDecorationTeam 2025-11-03 15:33:41 +08:00
苏竹红
614f42f7ca feat:handleDecorationTeam 2025-11-03 15:09:54 +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
苏竹红
18fb551a72 feat:团队 2025-10-31 15:14:08 +08:00
苏竹红
c498a017ce Merge branch 'master' into cc_20251028_decoration 2025-10-31 11:10:20 +08:00
苏竹红
45a53a5607 feat:团队 2025-10-31 09:58:04 +08:00
苏竹红
ec73dad33e feat:装修团队配置 2025-10-30 18:34:54 +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
苏竹红
3f23c0ae95 feat:装修配置表 2025-10-29 19:31:38 +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
苏竹红
17494e9fb4 feat:getOldShopCode 2025-10-23 18:01:44 +08: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
苏竹红
1a416ce4b4 feat:服务号通知 2025-10-16 15:44:09 +08:00
苏竹红
7be3958624 Merge branch 'cc_20251016_async' into cc_20251010_wxnotice 2025-10-16 13:48:22 +08:00
苏竹红
f112df17b0 feat:通知异步发布 2025-10-16 13:14:43 +08:00
苏竹红
47a371cbd7 feat:通知异步发布 2025-10-16 12:05:09 +08:00
苏竹红
0851b4fbf8 Merge branch 'cc_20250916_new' into 'master'
fix:添加门店mq消息新增省市区字段

See merge request hangzhou/java/custom_zxjp!170
2025-10-15 08:48:55 +00:00