王非凡
|
4be2276287
|
Merge #8 into master from cc_20250922_closeStore_w
闭店
* cc_20250922_closeStore_w: (44 commits squashed)
- feat:闭店流程init
- feat:闭店流程接口
- feat:闭店
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
- fix:闭店材料模块
- fix:账号关闭流程
- feat:闭店审批流程（未测）；字典表
- fix:闭店审批流程完善
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店流程流转补充
- feat:闭店退款
- fix:字典表接口
- Merge branch 'master' into cc_20250922_closeStore_w
- fix:闭店原因接口新增闭店发起方式字段
- fix:修改审批记录返回数据类型
feat:新增退款流程跳过
- fix
- fix:新增字段
- feat:新增闭店退款提交人列表接口
- fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段
- fix:新增接口返回字段
- fix:闭店管理、审批待办类别所属品牌筛选改为多选
- fix:闭店管理列表新增完成阶段数量字段
- feat:新增第三方闭店申请接口
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
- fix:自动发起闭店申请定时任务
- feat:火码账号关闭
- fix:闭店流程修改
- Merge branch 'master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
- fix:删除云流水发起闭店接口
- fix:取消闭店申请入参修改
- fix:闭店申请列表赋值异常问题
- fix:闭店审批通过异常
- fix:普通方法参数校验
- fix:账号关闭时校验阶段状态
- fix:初始化
- fix:字段新增
- fix:接口补充
- fix
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java
#	coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/dict/SysDictColumnDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/dict/SysDictColumnMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:闭店流程修改
- fix:闭店流程修改
- 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/8
|
2025-12-09 08:55:47 +00:00 |
|
苏竹红
|
1b0fb1b034
|
Merge #9 into master from cc_20251208_bank
feat:老店开通 V2
* cc_20251208_bank: (6 commits squashed)
- feat:银行的接口
- feat:银行的接口
- feat:bank
- fix:网商提交开通新增法人银行卡信息
- fix:小程序新增字典接口
- feat:老店开通 V2
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/9
|
2025-12-09 08:55:37 +00:00 |
|
苏竹红
|
d3d6ffb9ce
|
feat:openBasicInfoDTO
|
2025-12-04 19:16:04 +08:00 |
|
王非凡
|
c812021fad
|
Merge #5 into master from cc_20251114_minor_req
fix:菜品市场数据新增字段
* cc_20251114_minor_req: (5 commits squashed)
- fix:门店日营销数据
- fix:jackson反序列化配置忽略未定义字段
- fix:菜品市场数据新增字段
- fix:菜品市场数据新增字段
- Merge branch 'master' into cc_20251114_minor_req
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
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/5
|
2025-12-04 10:22:48 +00:00 |
|
苏竹红
|
7b8f220c26
|
Merge remote-tracking branch 'origin/master'
|
2025-12-04 18:22:25 +08:00 |
|
苏竹红
|
26d9dd7800
|
feat:openBasicInfoDTO
|
2025-12-04 18:22:17 +08: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 |
|
苏竹红
|
5f2fcf944e
|
feat:regionName
|
2025-12-04 14:53:48 +08:00 |
|
苏竹红
|
fb01212593
|
feat:合同数据
|
2025-12-04 14:27:47 +08:00 |
|
苏竹红
|
b715feef7f
|
feat:门店id 门店编号 限制
|
2025-12-04 13:50:07 +08:00 |
|
苏竹红
|
3e2b89e254
|
feat:开户支行不为空
|
2025-12-03 19:55:47 +08: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 |
|
苏竹红
|
c9efff2456
|
feat:contractEndTime
|
2025-12-02 18:35:13 +08:00 |
|
苏竹红
|
7d69b4ce05
|
Merge branch 'cc_20250905_franchiseAgreement' into 'master'
Cc 20250905 franchise agreement
See merge request hangzhou/java/custom_zxjp!199
|
2025-12-02 09:56:59 +00:00 |
|
wangff
|
c1e917ecda
|
fix:门店开放接口新增省市区字段
|
2025-12-02 15:36:50 +08:00 |
|
苏竹红
|
8b250b7449
|
feat:合同
|
2025-12-02 13:46:57 +08:00 |
|
wangff
|
d062009c56
|
fix
|
2025-12-01 16:37:40 +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 |
|
苏竹红
|
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
|
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 |
|
苏竹红
|
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 |
|
wangff
|
27d8f9c6fa
|
fix:门店账户列表新增开户总行名称字段
|
2025-11-19 17:10:20 +08:00 |
|