Commit Graph

2718 Commits

Author SHA1 Message Date
苏竹红
a4764491dc Merge branch 'cc_20251030_fwb' into 'master'
数据看板

See merge request hangzhou/java/custom_zxjp!179
2025-10-31 09:26:50 +00: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
苏竹红
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
苏竹红
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
wangff
1cb6e26017 Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
2025-10-15 11:28:38 +08:00
苏竹红
ba6835a887 feat:微信通知改造 2025-10-15 10:32:48 +08:00
苏竹红
211fc19499 feat:微信通知改造 2025-10-14 19:02:09 +08:00
苏竹红
28e1b860b1 feat:通知 2025-10-14 17:01:52 +08:00
苏竹红
89a14766ae feat:通知 2025-10-14 15:10:54 +08:00
wangff
2a8abd0b3e fix:添加门店mq消息新增省市区字段 2025-10-14 11:00:19 +08:00
苏竹红
b4e88f5424 feat:云流水 2025-10-13 16:03:32 +08:00
苏竹红
7752433027 feat:微信通知 2025-10-13 15:36:42 +08:00
苏竹红
d8b3f89539 Merge branch 'cc_20250918_cp_token' into 'master'
fix:菜品市场免登短期token接口;短期token换用户信息接口

See merge request hangzhou/java/custom_zxjp!168
2025-10-10 08:21:49 +00:00
苏竹红
4b9e546ffb feat:所属大区 2025-10-08 09:51:00 +08:00
苏竹红
f06b5683af feat:getPOSToken 2025-10-05 15:52:40 +08:00
苏竹红
3c53c4bc5d feat:getYlsToken 2025-09-28 22:00:39 +08:00
苏竹红
4cdc045ea6 feat:督导也能查看店 2025-09-26 16:44:27 +08:00
苏竹红
6bc6a3262a feat:mq 2025-09-25 17:50:08 +08:00
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +08:00
wangff
eb53fe9d2d Merge branch 'master' into cc_20250905_storeExtendInfo
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
2025-09-23 14:11:42 +08:00
wangff
77cf158d3c fix:获取门店人员信息新增签约人员信息 2025-09-23 14:00:01 +08:00
苏竹红
00aee8919d Merge branch 'cc_20250916_new' into 'master'
fix:获取门店信息开放接口新增收货信息字段

See merge request hangzhou/java/custom_zxjp!162
2025-09-19 09:10:23 +00:00
wangff
b5984f2e01 fix:获取门店信息开放接口新增收货信息字段 2025-09-18 14:22:44 +08:00
wangff
ad0b6f0ed9 fix:免登短期token接口;短期token换用户信息接口 2025-09-18 11:13:16 +08:00
苏竹红
c68ae7a701 Merge branch 'cc_20250916_buildstore' into 'master'
Cc 20250916 buildstore

See merge request hangzhou/java/custom_zxjp!160
2025-09-17 09:56:15 +00:00
苏竹红
f491de1116 feat:bug修复 2025-09-17 13:24:02 +08:00
苏竹红
4251b69eab feat:新建店添加合同编码字段 2025-09-16 11:14:54 +08:00