Commit Graph

4312 Commits

Author SHA1 Message Date
苏竹红
c99c4375d7 feat:签名 2025-11-12 16:27:52 +08:00
苏竹红
bb1939b42a Merge branch 'cc_20251110_bugfix' into 'master'
Cc 20251110 bugfix

See merge request hangzhou/java/custom_zxjp!185
2025-11-10 08:16:31 +00:00
苏竹红
b51762dc50 feat:服务包专用角色 2025-11-10 15:58:15 +08:00
苏竹红
3ebea6476e feat:信发 2025-11-10 13:25:13 +08:00
zhangchenbiao
2f82e4ac10 Merge branch 'cc_20251104_xinfa' into 'master'
Cc 20251104 xinfa

See merge request hangzhou/java/custom_zxjp!184
2025-11-07 06:48:28 +00:00
wangff
549a4fbd04 fix:补充配置 2025-11-07 14:42:39 +08:00
wangff
8972bd8be0 fix 2025-11-07 14:16:38 +08:00
wangff
10f21f15dc fix:信发设备详情接口及发布接口序列化和反序列化处理 2025-11-07 14:05:52 +08:00
wangff
67d0b7c726 fix:信发发布新增节目id,接口调用失败情况下抛出异常 2025-11-07 10:15:16 +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
苏竹红
e10525cedd feat:getStoreXinFaDeviceDetail 2025-11-05 10:04:18 +08:00
苏竹红
6c04721042 Merge branch 'cc_20251103_open_api' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!183
2025-11-03 11:25:11 +00:00
wangff
93be3e24a4 fix 2025-11-03 19:24:12 +08:00
苏竹红
13d7c3930f Merge branch 'cc_20251103_open_api' into 'master'
fix:菜品市场菜品服务包上新接口新增字段

See merge request hangzhou/java/custom_zxjp!182
2025-11-03 10:35:37 +00:00
wangff
3a5ac5cdc4 fix:菜品市场菜品服务包上新接口新增字段 2025-11-03 18:29:14 +08:00
苏竹红
62952e7ba0 Merge branch 'cc_20251103_open_api' into 'master'
fix:获取门店信息开放接口新增门店状态字段

See merge request hangzhou/java/custom_zxjp!181
2025-11-03 09:36:31 +00: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
11b020f2cf feat:Mini数据看板 2025-10-30 14:29:31 +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
苏竹红
d65b528a74 feat:callback 2025-10-30 11:01:08 +08:00
苏竹红
11178ae0e3 feat:callback 2025-10-30 10:50:01 +08:00
苏竹红
ab105dda76 feat:echostr 2025-10-30 10:33:12 +08:00
苏竹红
1150282d98 Merge branch 'cc_20251010_wxnotice' into 'master'
Cc 20251010 wxnotice

See merge request hangzhou/java/custom_zxjp!178
2025-10-29 11:45:19 +00: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
苏竹红
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
苏竹红
fce70bec9e feat:callback 2025-10-28 13:40:26 +08:00
苏竹红
bf80d825a8 feat:回调处理 2025-10-28 13:39:23 +08:00
苏竹红
5120b2c48c feat:appid 2025-10-28 11:25:43 +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
苏竹红
f301234f26 feat:加盟部只能新建加盟店或者联营店 2025-10-27 17:01:35 +08:00
苏竹红
8b4a594d51 Merge branch 'cc_20251027_latest_order' into 'master'
门店最近订货时间定时任务

See merge request hangzhou/java/custom_zxjp!175
2025-10-27 08:59:01 +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
e74e12fe7c fix:requestId 2025-10-27 14:05:50 +08:00
wangff
1830e2240e fix:最新订货时间定时任务过滤门店状态 2025-10-27 13:46:48 +08:00
wangff
b2076cc6c5 feat:门店最近订货时间定时任务 2025-10-27 13:32:23 +08:00