苏竹红
|
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 |
|
苏竹红
|
0f3bafd5ee
|
Merge branch 'cc_20251112_wallet' into 'master'
Cc 20251112 wallet
See merge request hangzhou/java/custom_zxjp!196
|
2025-11-28 08:47:13 +00:00 |
|
苏竹红
|
d431a0205f
|
feat:合同
|
2025-11-28 11:18:39 +08:00 |
|
苏竹红
|
6727fe6931
|
feat:合同
|
2025-11-28 11:14:31 +08:00 |
|
苏竹红
|
cea7fe70ea
|
feat:账户余额
|
2025-11-28 09:11:44 +08:00 |
|
苏竹红
|
2531761830
|
feat:existPassword
|
2025-11-27 20:28:51 +08:00 |
|
苏竹红
|
7a10dc6bf7
|
Merge branch 'cc_20251112_wallet' into 'master'
钱包
See merge request hangzhou/java/custom_zxjp!194
|
2025-11-27 08:39:10 +00: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 |
|
苏竹红
|
c404e6c51a
|
feat:合同
|
2025-11-27 10:23:40 +08:00 |
|
苏竹红
|
c89013ff8d
|
feat:是否存在密码
|
2025-11-26 18:21:24 +08:00 |
|
wangff
|
e321dc8fbb
|
fix:门店列表开放接口新增字段
|
2025-11-26 16:13:16 +08:00 |
|
wangff
|
e079a8b83c
|
fix:门店账户分页接口新增字段；打标接口完善
|
2025-11-26 10:11:08 +08:00 |
|
wangff
|
ec43537f66
|
fix:门店账户新增字段
|
2025-11-25 18:07:46 +08:00 |
|
wangff
|
c3f00b4a1f
|
fix:门店流水分页查询新增字段
|
2025-11-25 16:52:59 +08:00 |
|
苏竹红
|
1ca3994821
|
feat:合同
|
2025-11-25 16:31:42 +08:00 |
|
苏竹红
|
19376134d0
|
feat:正新
|
2025-11-25 13:50:30 +08:00 |
|
wangff
|
93417c4a4f
|
fix：流水返回对象统一
|
2025-11-24 16:27:19 +08:00 |
|
苏竹红
|
9bc035fffd
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-24 13:44:58 +08:00 |
|
苏竹红
|
07207847eb
|
feat:身份证背面解析
|
2025-11-24 13:44:45 +08:00 |
|
wangff
|
be84221cf0
|
fix：字段补充
|
2025-11-24 13:42:05 +08:00 |
|
wangff
|
e5c59b3839
|
fix
|
2025-11-24 10:29:43 +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 |
|
苏竹红
|
bd1486c08a
|
feat:验签调整
|
2025-11-21 15:18:06 +08:00 |
|
苏竹红
|
537ecb2f61
|
feat:合同编号
|
2025-11-21 13:28:24 +08:00 |
|
wangff
|
fb6170833c
|
fix:新增网商是否已激活标识
|
2025-11-21 10:03:58 +08:00 |
|
wangff
|
38a669dff9
|
fix:开店流程网商开通失败标识缓存；小程序账户列表返回对象修改；根据门店编码查询开通基础信息逻辑修改；网商账户提交逻辑修改；
feat:网商激活接口
|
2025-11-20 16:44:24 +08:00 |
|
苏竹红
|
4581aeb85a
|
feat:老店提交开通
|
2025-11-20 15:48:31 +08:00 |
|
苏竹红
|
297c6e35c4
|
feat:通过门店Code 查询存量客户开通基本信息
|
2025-11-20 15:22:50 +08:00 |
|
wangff
|
27d8f9c6fa
|
fix:门店账户列表新增开户总行名称字段
|
2025-11-19 17:10:20 +08:00 |
|
苏竹红
|
082e044b5a
|
Merge branch 'master' into cc_20251112_wallet
|
2025-11-19 16:45:05 +08:00 |
|
wangff
|
ff9be4e61b
|
fix:建店时候调用创建门店接口；流水接口新增收入支出字段；新增账户详情接口、交易详情接口
|
2025-11-19 16:23:14 +08:00 |
|
苏竹红
|
2335ecca4c
|
feat:storeId
|
2025-11-19 14:56:52 +08:00 |
|
苏竹红
|
f042431572
|
feat:PC接口
|
2025-11-19 14:51:14 +08:00 |
|
wangff
|
088ee0a0e5
|
fix:打标接口针对网商改动；字段名修改；网商开通回调；大额充值回调
|
2025-11-19 14:41:40 +08:00 |
|
wangff
|
3ddf965a6c
|
fix
|
2025-11-18 18:52:21 +08:00 |
|
wangff
|
0781a4059f
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AddTagCallbackNoticeRequest.java
|
2025-11-18 18:44:32 +08:00 |
|
wangff
|
ac5a06bdad
|
fix:打标失败处理
|
2025-11-18 18:44:10 +08:00 |
|
苏竹红
|
f40cfb5c92
|
feat:网商接口
|
2025-11-18 18:22:50 +08:00 |
|
wangff
|
9ae993c248
|
fix:rest接口规范
|
2025-11-18 16:59:10 +08:00 |
|
wangff
|
6d6f72dbc9
|
fix:pc账户列表接口
|
2025-11-18 14:23:32 +08:00 |
|
wangff
|
267bd0e7b3
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-18 11:29:53 +08:00 |
|
wangff
|
f983c8a92d
|
fix:小程序支付密码修改、充值、充值列表、提现接口
|
2025-11-18 11:29:42 +08:00 |
|
苏竹红
|
579bef59cd
|
feat:优化
|
2025-11-18 10:28:47 +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
|
f5283b783c
|
fix:新增小程序账户列表及流水接口
|
2025-11-17 18:01:01 +08:00 |
|
wangff
|
0e1955a5ed
|
fix
|
2025-11-17 15:53:06 +08:00 |
|
苏竹红
|
04b5a4e7bc
|
feat:打标回调通知接口
|
2025-11-17 14:14:47 +08:00 |
|
wangff
|
f499d1827b
|
fix:待办缴纳加盟费用列表新增加盟品牌字段
|
2025-11-17 13:17:23 +08:00 |
|