suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,691 Commits 1 Branch 0 Tags
46937eacc7e18e26619196d2608b7de62f405369
Commit Graph

985 Commits

Author SHA1 Message Date
正新
0ad517dce6 Merge #28 into master from cc_20260114_fix 
feat:红圈通邮箱

* cc_20260114_fix: (8 commits squashed)

  - feat:加盟公司自有店-开放推送红圈通

  - feat:加盟公司自有店-开放推送红圈通 2、结束门店解绑铺位 3、红圈通新增招商所属大区 运营顾问字段

  - feat:红圈通新增推送邮箱

  - fix:大区取值

  - fix:测试

  - feat:推送人员名称

  - feat:结束跟进  目前是任何时候都可以，单独解绑铺位 需要在加盟签约合同之前

  - feat:红圈通邮箱

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/28
 2026-01-19 07:05:42 +00:00
正新
82a49a03d2 Merge #26 into master from cc_20260105_partner 
feat:测试

* cc_20260105_partner: (8 commits squashed)

  - feat:加盟商意向书字段调整

  - feat:意向审核

  - feat:加盟商意向申请

  - feat:新增其他备注

  - feat:返回信息缺失

  - feat:资质阶段审核完成才回成为加盟商

  - feat:大区查询阶段状态是6

  - feat:测试

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26
 2026-01-14 11:03:42 +00:00
正新
6a3d589d0c Merge #25 into master from cc_20260113_fix 
feat:updateLineRegion

* cc_20260113_fix: (1 commits squashed)

  - feat:updateLineRegion

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/25
 2026-01-13 07:17:35 +00:00
王非凡
e34aea7a40 Merge #19 into master from cc_20251223_orgChange 
组织架构迁移

* cc_20251223_orgChange: (32 commits squashed)

  - fix:角色枚举值变更

  - fix:待办-缴纳加盟费/保证金中，删除企微督导查询权限，督导查询权限改为招商经理；待办-建店资料中，删除企微督导查询权限

  - fix:开店管理-查询我负责的招商经理或运营顾问为当前用户的；查询我管辖的如果当前用户是招商经理则查招商区域

  - feat:组织架构切换调整

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:门店详情新增招商所属大区 运营顾问

  - fix:获取可选择的大区新增type字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:修改招商所属大区

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - feat:新增分店 修改分店

  - feat:operations_consultant

  - fix:获取平台建店左侧小窗详情接口新增招商区域名称字段

  - feat:合同开始之后需要分配才能触发后续阶段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:新增招商区域名称字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:大区查询添加enableFlag字段

  - Merge remote-tracking branch &#39;origin/cc_20251223_orgChange&#39; into cc_20251223_orgChange

  - fix:代办查询bug修改

  - fix:字段缺失补充

  - Merge branch &#39;master&#39; into cc_20251223_orgChange
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

  - fix:修改基本资料bug

  - fix:线索列表接口新增招商所属区域名称字段

  - fix:加盟商资质审核通过自动建店时带出招商所属区域

  - fix:补充提交

  - fix:修改开店详情接口修改招商所属区域

  - fix:工作台待办返回招商区域名称字段

  - fix:开店详情接口招商所属区域id为0的数据返回null

  - fix:字段补充

  - fix:招商所属大区字段补充

  - fix:字段补充

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/19
 2025-12-31 06:56:47 +00:00
suzhuhong
f279db70a3 fix:人员门店支持关键字keywork搜索 2025-12-25 20:08:02 +08:00
suzhuhong
655b9a8f17 fix:人员门店支持关键字keywork搜索 2025-12-25 20:01:24 +08:00
苏竹红
e97c147fac Merge #17 into master from cc_20251218_opening 
Merge branch &#39;master&#39; into cc_20251218_opening

* cc_20251218_opening: (11 commits squashed)

  - fix:信发查询bug

  - fix:信发查询bug

  - fix:测试

  - fix:老店新开不需要开业验收

  - feat:开业验收数据处理

  - fix:开业验收bug修复

  - fix:开业验收bug修复

  - fix:云流水权限开通

  - feat:开业验收数据处理

  - feat:开业验收数据处理

  - Merge branch &#39;master&#39; into cc_20251218_opening

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
 2025-12-25 10:50:38 +00:00
王非凡
32ae1b7315 Merge #16 into master from cc_20250916_new 
大屏Iot获取token接口

* cc_20250916_new: (6 commits squashed)

  - feat:第三方Iot接口对接

  - Merge branch &#39;refs/heads/master&#39; into cc_20250916_new
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties

  - fix

  - fix:修改http请求工具

  - Merge branch &#39;refs/heads/master&#39; into cc_20250916_new
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-web/src/main/resources/application-ab.properties
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties
    #&#9;coolstore-partner-web/src/main/resources/application-online.properties
    #&#9;coolstore-partner-web/src/main/resources/application-test.properties

  - fix:短信签名修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/16
 2025-12-19 09:07:35 +00:00
苏竹红
cf5d16b822 Merge #13 into master from cc_20251211_jinjian 
feat:进件

* cc_20251211_jinjian: (3 commits squashed)

  - feat:进件

  - Merge branch &#39;master&#39; into cc_20251211_jinjian

  - feat:进件

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/13
 2025-12-15 09:43:50 +00:00
王非凡
b4b4d0b988 Merge #11 into master from cc_20251114_minor_req 
fix:数据看板日营业数据字段修改

* cc_20251114_minor_req: (8 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch &#39;master&#39; into cc_20251114_minor_req
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch &#39;refs/heads/master&#39; into cc_20251114_minor_req
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/11
 2025-12-11 09:09:27 +00:00
苏竹红
1e6912bf59 Merge #10 into master from cc_20251110_ossupdate 
feat:oss切换

* cc_20251110_ossupdate: (1 commits squashed)

  - feat:oss切换

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/10
 2025-12-11 01:08:26 +00:00
王非凡
4be2276287 Merge #8 into master from cc_20250922_closeStore_w 
闭店

* cc_20250922_closeStore_w: (44 commits squashed)

  - feat:闭店流程init

  - feat:闭店流程接口

  - feat:闭店

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w

  - fix:闭店材料模块

  - fix:账号关闭流程

  - feat:闭店审批流程（未测）；字典表

  - fix:闭店审批流程完善

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w

  - fix:闭店流程流转补充

  - feat:闭店退款

  - fix:字典表接口

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w

  - fix:闭店原因接口新增闭店发起方式字段

  - fix:修改审批记录返回数据类型
    feat:新增退款流程跳过

  - fix

  - fix:新增字段

  - feat:新增闭店退款提交人列表接口

  - fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段

  - fix:新增接口返回字段

  - fix:闭店管理、审批待办类别所属品牌筛选改为多选

  - fix:闭店管理列表新增完成阶段数量字段

  - feat:新增第三方闭店申请接口

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml

  - fix:自动发起闭店申请定时任务

  - feat:火码账号关闭

  - fix:闭店流程修改

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;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 &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java

  - Merge branch &#39;refs/heads/master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/dict/SysDictColumnDAO.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/dict/SysDictColumnMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java
    #&#9;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
王非凡
aaaa40f2c8 Merge #7 into master from cc_20251209_dict 
fix:小程序新增字典接口

* cc_20251209_dict: (1 commits squashed)

  - 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/7
 2025-12-09 07:49:16 +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 &#39;refs/heads/master&#39; 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
苏竹红
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
苏竹红
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
苏竹红
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
苏竹红
c89013ff8d feat:是否存在密码 2025-11-26 18:21:24 +08:00
苏竹红
0852a3b376 feat:线上 2025-11-26 18:12:34 +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
e5a3abbdc7 fix:账户流水返回结果修改 2025-11-25 14:27:42 +08:00
苏竹红
4206cde16c feat:token 2025-11-24 16:52:25 +08:00
wangff
93417c4a4f fix：流水返回对象统一 2025-11-24 16:27:19 +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
苏竹红
d74f4a5c19 feat:验签调整 2025-11-21 12:41:52 +08:00
苏竹红
ea618f0643 feat:验签改为秒 2025-11-21 10:58:39 +08:00
wangff
f53b77b657 fix 2025-11-20 18:16:18 +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
wangff
8f1182f3ee fix:钱包pc接口补充 2025-11-20 10:15:34 +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
苏竹红
f042431572 feat:PC接口 2025-11-19 14:51:14 +08:00
wangff
94ac7c9fbe fix:补充提交 2025-11-19 14:42:30 +08:00
wangff
088ee0a0e5 fix:打标接口针对网商改动；字段名修改；网商开通回调；大额充值回调 2025-11-19 14:41:40 +08:00
wangff
af52a60e50 fix:小程序接口请求类型修改 2025-11-18 18:47:17 +08:00
苏竹红
f40cfb5c92 feat:网商接口 2025-11-18 18:22:50 +08:00
wangff
9ae993c248 fix:rest接口规范 2025-11-18 16:59:10 +08:00
苏竹红
7703e4ef09 feat:营账通key 2025-11-18 15:08:35 +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