苏竹红
|
d7c8dd21fd
|
Merge #6 into master from cc_20251203_bugfix
feat:getPosToken
* cc_20251203_bugfix: (1 commits squashed)
- feat:getPosToken
Signed-off-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/6
|
2025-12-09 03:12:33 +00:00 |
|
苏竹红
|
2237ed3f4a
|
feat:openBasicInfoDTO
|
2025-12-05 14:07:43 +08:00 |
|
王非凡
|
9a62d2e0c0
|
Merge #2 into master from cc_20251112_wallet
fix:临时关闭营帐通建店推送
* cc_20251112_wallet: (2 commits squashed)
- fix:钱包提现返回结果修改
- 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/2
|
2025-12-04 09:48:29 +00:00 |
|
王非凡
|
edbec8d8c1
|
Merge #3 into master from cc_20251114_minor_req
fix:门店日营销数据
* cc_20251114_minor_req: (3 commits squashed)
- fix:门店日营销数据
- fix:jackson反序列化配置忽略未定义字段
- 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/3
|
2025-12-04 09:48:19 +00: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 |
|
苏竹红
|
43f37734b4
|
feat:openBasicInfoDTO
|
2025-12-04 17:46:24 +08:00 |
|
苏竹红
|
30ae3fb841
|
feat:正新鸡排优惠
|
2025-12-04 16:24:44 +08:00 |
|
苏竹红
|
1e6fcd683c
|
feat:discountAmount
|
2025-12-04 16:11:53 +08:00 |
|
苏竹红
|
5f2fcf944e
|
feat:regionName
|
2025-12-04 14:53:48 +08:00 |
|
苏竹红
|
fb01212593
|
feat:合同数据
|
2025-12-04 14:27:47 +08:00 |
|
苏竹红
|
1a9138aaa4
|
feat:getCashierFee
|
2025-12-04 10:21:57 +08:00 |
|
苏竹红
|
a1a3b52516
|
Merge #1 into master from cc_20251112_wallet
fix:钱包提现返回结果修改
* cc_20251112_wallet: (1 commits squashed)
- fix:钱包提现返回结果修改
Signed-off-by: 苏竹红 <accounts_68551bf01395375227aee211@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/1
|
2025-12-03 09:36:25 +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 |
|
苏竹红
|
82dc2cd47f
|
feat:待缴费才能操作
|
2025-12-02 18:04:05 +08:00 |
|
苏竹红
|
597baa82b9
|
feat:合同
|
2025-12-02 14:03:57 +08:00 |
|
苏竹红
|
71c6446cd3
|
feat:门店编码查询
|
2025-12-01 13:56:39 +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 |
|
苏竹红
|
d431a0205f
|
feat:合同
|
2025-11-28 11:18:39 +08:00 |
|
苏竹红
|
6727fe6931
|
feat:合同
|
2025-11-28 11:14:31 +08:00 |
|
苏竹红
|
2531761830
|
feat:existPassword
|
2025-11-27 20:28:51 +08:00 |
|
苏竹红
|
85761cef63
|
feat:setBusinessLicensePhoto
|
2025-11-27 18:32:24 +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 |
|
苏竹红
|
c89013ff8d
|
feat:是否存在密码
|
2025-11-26 18:21:24 +08:00 |
|
wangff
|
e079a8b83c
|
fix:门店账户分页接口新增字段；打标接口完善
|
2025-11-26 10:11:08 +08:00 |
|
苏竹红
|
7d2b2f40e4
|
feat:backPayFeeStage
|
2025-11-26 10:05:21 +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
|
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
|
e54764a065
|
fix:字段补充
|
2025-11-21 14:45:43 +08:00 |
|
苏竹红
|
537ecb2f61
|
feat:合同编号
|
2025-11-21 13:28:24 +08:00 |
|
wangff
|
fb6170833c
|
fix:新增网商是否已激活标识
|
2025-11-21 10:03:58 +08:00 |
|
苏竹红
|
4db4068a77
|
feat:延迟4个小时
|
2025-11-20 18:18:06 +08:00 |
|
wangff
|
300bcefa72
|
fix
|
2025-11-20 17:57:37 +08:00 |
|
wangff
|
33b55a58b9
|
Merge branch 'refs/heads/master' into cc_2021104_twelve_points
|
2025-11-20 16:54:35 +08:00 |
|
wangff
|
052b0f368a
|
fix:接口平安错误码确认
|
2025-11-20 16:48:57 +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
|
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 |
|
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
|
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 |
|