苏竹红
|
a444130b21
|
feat:bot
|
2025-12-09 15:39:43 +08:00 |
|
王非凡
|
e57f8c7925
|
Merge #4 into master from cc_20251027_new2
fix:小程序菜单
* cc_20251027_new2: (3 commits squashed)
- feat:小程序菜单配置
- Merge branch 'refs/heads/master' into cc_20251027_new2
- fix:小程序菜单
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Merged-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/4
|
2025-12-04 09:48:08 +00:00 |
|
wangff
|
1cbd411598
|
Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
|
2025-12-02 19:34:14 +08:00 |
|
苏竹红
|
ee54802f7e
|
Merge branch 'master' into cc_20250905_franchiseAgreement
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
|
2025-12-01 10:50:32 +08:00 |
|
苏竹红
|
09ef3693a1
|
feat:门店编码查询
|
2025-11-28 16:58:23 +08:00 |
|
wangff
|
6ff0ed86fc
|
Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-27 16:38:50 +08:00 |
|
wangff
|
33181f188f
|
fix:存量门店开通网商新增身份证有效期字段
|
2025-11-24 10:26:57 +08:00 |
|
苏竹红
|
97d3e76971
|
Merge branch 'master' into cc_20251028_decoration
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-21 16:38:36 +08:00 |
|
wangff
|
33b55a58b9
|
Merge branch 'refs/heads/master' into cc_2021104_twelve_points
|
2025-11-20 16:54:35 +08:00 |
|
wangff
|
38a669dff9
|
fix:开店流程网商开通失败标识缓存；小程序账户列表返回对象修改；根据门店编码查询开通基础信息逻辑修改；网商账户提交逻辑修改；
feat:网商激活接口
|
2025-11-20 16:44:24 +08:00 |
|
苏竹红
|
546b95b6bb
|
feat:通过门店Code 查询存量客户开通基本信息
|
2025-11-20 15:39:18 +08:00 |
|
苏竹红
|
297c6e35c4
|
feat:通过门店Code 查询存量客户开通基本信息
|
2025-11-20 15:22:50 +08:00 |
|
wangff
|
4e5c228974
|
fix:十二分接口逻辑完善
|
2025-11-20 14:31:12 +08:00 |
|
苏竹红
|
082e044b5a
|
Merge branch 'master' into cc_20251112_wallet
|
2025-11-19 16:45:05 +08:00 |
|
苏竹红
|
2335ecca4c
|
feat:storeId
|
2025-11-19 14:56:52 +08:00 |
|
wangff
|
f983c8a92d
|
fix:小程序支付密码修改、充值、充值列表、提现接口
|
2025-11-18 11:29:42 +08:00 |
|
wangff
|
d1e045a72f
|
fix:大额支付订单流水
|
2025-11-18 09:18:41 +08:00 |
|
苏竹红
|
2d6d2693c1
|
feat:is_delete
|
2025-11-17 10:43:47 +08:00 |
|
苏竹红
|
93f6d93305
|
Merge branch 'cc_20251029_smz' into 'master'
所属大区新增品牌筛选
See merge request hangzhou/java/custom_zxjp!190
|
2025-11-14 10:53:01 +00: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
|
7267868f16
|
fix:所属大区新增品牌筛选
|
2025-11-13 11:19:12 +08:00 |
|
wangff
|
13c44053c2
|
fix:问题修复
|
2025-11-13 10:40:30 +08:00 |
|
wangff
|
e6e57d6304
|
fix:新建shop门店新增storeId，建店携带storeId
|
2025-11-12 18:39:52 +08:00 |
|
苏竹红
|
6cb4086783
|
feat:证照同步异常处理
|
2025-11-12 13:19:30 +08:00 |
|
wangff
|
b35903010c
|
fix:十二分制-移动端接口；PC端接口补充
|
2025-11-11 13:58:24 +08:00 |
|
苏竹红
|
b51762dc50
|
feat:服务包专用角色
|
2025-11-10 15:58:15 +08:00 |
|
wangff
|
bd64b33ebb
|
fix:十二分制-申请单
|
2025-11-10 14:20:44 +08:00 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +08:00 |
|
wangff
|
85a411bc9a
|
fix:十二分制-奖惩规则
|
2025-11-05 15:40:31 +08:00 |
|
苏竹红
|
c9c8d6d049
|
feat:request
|
2025-11-05 10:26:56 +08:00 |
|
wangff
|
75a0ad4676
|
feat:十二分制-奖惩规则
|
2025-11-04 17:53:02 +08:00 |
|
苏竹红
|
6d974b60a1
|
feat:删除团队
|
2025-11-04 09:28:38 +08:00 |
|
苏竹红
|
ddaa9bd1fe
|
feat:handleDecorationTeam
|
2025-11-03 15:33:41 +08:00 |
|
苏竹红
|
614f42f7ca
|
feat:handleDecorationTeam
|
2025-11-03 15:09:54 +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 |
|
苏竹红
|
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 |
|
苏竹红
|
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 |
|
wangff
|
1830e2240e
|
fix:最新订货时间定时任务过滤门店状态
|
2025-10-27 13:46:48 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +08:00 |
|
苏竹红
|
7b88d3bec9
|
feat:服务号通知异常处理
|
2025-10-16 16:31:45 +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 |
|
苏竹红
|
24b4be799e
|
feat:微信通知改造
|
2025-10-15 10:47:57 +08:00 |
|
苏竹红
|
211fc19499
|
feat:微信通知改造
|
2025-10-14 19:02:09 +08:00 |
|
苏竹红
|
4b9e546ffb
|
feat:所属大区
|
2025-10-08 09:51:00 +08:00 |
|
苏竹红
|
3fbac3c28b
|
feat:大区总
|
2025-10-05 20:00:46 +08:00 |
|