Commit Graph

729 Commits

Author SHA1 Message Date
苏竹红
297c6e35c4 feat:通过门店Code 查询存量客户开通基本信息 2025-11-20 15:22:50 +08:00
苏竹红
082e044b5a Merge branch 'master' into cc_20251112_wallet 2025-11-19 16:45:05 +08:00
wangff
088ee0a0e5 fix:打标接口针对网商改动;字段名修改;网商开通回调;大额充值回调 2025-11-19 14:41:40 +08:00
wangff
f983c8a92d fix:小程序支付密码修改、充值、充值列表、提现接口 2025-11-18 11:29:42 +08:00
wangff
d1e045a72f fix:大额支付订单流水 2025-11-18 09:18:41 +08:00
wangff
0d882ff79a fix:账户列表、密码更新接口 2025-11-18 09:17:45 +08:00
wangff
fcef86762d fix:打标接口调用新增账户状态校验 2025-11-17 11:12: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
wangff
022169eee1 fix:所属大区新增品牌筛选 2025-11-13 11:33:13 +08:00
wangff
7267868f16 fix:所属大区新增品牌筛选 2025-11-13 11:19:12 +08:00
wangff
e6e57d6304 fix:新建shop门店新增storeId,建店携带storeId 2025-11-12 18:39:52 +08:00
wangff
4a08933e36 fix:三明治不初始化营帐通开通阶段 2025-11-11 20:01:55 +08:00
wangff
1af57c5871 fix:三明治不初始化营帐通开通阶段 2025-11-11 19:42:44 +08:00
wangff
c0d76eda61 fix:获取云流水免登token接口处理不存在老店数据的门店 2025-11-03 14:57:13 +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
1830e2240e fix:最新订货时间定时任务过滤门店状态 2025-10-27 13:46:48 +08:00
wangff
b2076cc6c5 feat:门店最近订货时间定时任务 2025-10-27 13:32:23 +08:00
苏竹红
1a416ce4b4 feat:服务号通知 2025-10-16 15:44:09 +08: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
苏竹红
211fc19499 feat:微信通知改造 2025-10-14 19:02:09 +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
48fe55c8be fix 2025-09-23 14:01:48 +08:00
wangff
77cf158d3c fix:获取门店人员信息新增签约人员信息 2025-09-23 14:00:01 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
wangff
0d42743778 Merge branch 'cc_20250909_new' into cc_20250903_big_screen 2025-09-09 10:46:29 +08:00
苏竹红
dd2aae3cc8 Merge branch 'master' into cc_20250826_notice
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-09-09 09:46:06 +08:00
wangff
435b24be48 fix:新增平台库数据源
feat:新增账密登录接口
2025-09-04 14:19:08 +08:00
苏竹红
a11e150630 feat:获取用户只有督导用户 2025-09-03 17:15:45 +08:00
苏竹红
dce1fe5e52 feat:matterType 2025-08-29 13:16:33 +08:00
苏竹红
d5b1960996 feat:通知接口 2025-08-27 11:24:00 +08:00
苏竹红
8219e8b869 Merge branch 'cc_20250813_storeMaster' into 'master'
Cc 20250813 store master

See merge request hangzhou/java/custom_zxjp!154
2025-08-21 09:10:08 +00:00
苏竹红
773230dabf feat:加盟费处理 2025-08-20 14:25:57 +08:00
苏竹红
6aafc3970f feat:主数据同步 2025-08-18 09:29:44 +08:00
shuo.wang
3951189e7a fix updateByPrimaryKeySelective 2025-08-14 12:30:13 +08:00
shuo.wang
3f33ed21cb Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-08-07 18:03:44 +08:00
shuo.wang
fe13e9edfa 装修调整 2025-08-06 19:20:13 +08:00
shuo.wang
eb9d469833 红圈通接口改造hqtShopId 2025-08-06 09:25:23 +08:00
shuo.wang
d7569b8435 门店编码重复校验 2025-08-04 16:21:21 +08:00
shuo.wang
9bb391559c 红圈通接口 加校验 2025-08-04 10:47:00 +08:00
shuo.wang
a7065fabd9 红圈通接口 2025-07-31 15:47:33 +08:00
苏竹红
40a8ed9460 feat:bug修复 2025-07-28 11:19:37 +08:00
苏竹红
00f883192a feat:事项 2025-07-27 22:20:33 +08:00
苏竹红
5035a7e054 feat:事项 2025-07-25 17:24:56 +08:00
苏竹红
ba90fca7fe feat:事项 2025-07-25 17:12:06 +08:00
shuo.wang
1776f3a262 fix 2025-07-25 14:07:20 +08:00
苏竹红
b10f129271 feat:事项配置 2025-07-24 17:28:42 +08:00
shuo.wang
9fa0d19cd4 Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
2025-07-24 15:29:31 +08:00
shuo.wang
fbae407c00 装修接口 2025-07-23 17:02:14 +08:00
苏竹红
1b88d4e15a feat:接口调整 2025-07-23 09:48:47 +08:00
苏竹红
6fad009386 feat:门店人员 2025-07-22 15:57:39 +08:00