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

2902 Commits

Author SHA1 Message Date
suzhuhong
a8fe891b70 feat:加盟合同审批 使用招商所属区域 2026-01-27 09:42:33 +08:00
suzhuhong
aa250fa6d0 Merge remote-tracking branch 'origin/master' 2026-01-23 16:39:49 +08:00
suzhuhong
6d55e5fcdf feat:发布 2026-01-23 16:39:34 +08:00
王非凡
3206a20dd6 Merge #34 into master from cc_20260116_new_field 
fix:加盟合同新增字段推送红圈通

* cc_20260116_new_field: (5 commits squashed)

  - fix:加盟合同新增字段

  - fix:加盟合同新增字段

  - Merge branch 'refs/heads/master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - fix:加盟合同新增字段推送红圈通

  - Merge branch 'master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/34
 2026-01-23 08:37:13 +00:00
正新
10dca9bf9b Merge #32 into master from cc_20260113_open 
开业日期报备

* cc_20260113_open: (15 commits squashed)

  - feat:阶段调整

  - feat:开业阶段调整

  - feat:开业日期报备

  - feat:开业日期报备代办

  - feat:文本通知

  - feat:数据处理

  - fix:bug

  - feat:通知功能

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java

  - feat:开业代办新增代办预计开业时间

  - feat:开业时间查询

  - feat:开业

  - feat:PC计划开业时间

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

  - Merge branch &#39;master&#39; into cc_20260113_open
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

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/32
 2026-01-23 06:49:50 +00:00
王非凡
41ae24478d Merge #31 into master from cc_2021104_twelve_points 
十二分

* cc_2021104_twelve_points: (34 commits squashed)

  - fix:启用禁用规则合并

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

  - fix:惩处规则列表新增描述字段

  - fix:新增用户管辖门店列表接口

  - fix:门店列表接口新增门店积分字段

  - fix:查询问题修复；新增草稿状态

  - fix:申请单审批补充审批人字段

  - fix:修改门店积分限制0-12

  - fix:积分流水接口修复；申请单查询接口添加日期筛选

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix:惩处单复议申请查询异常修复

  - fix:小程序惩处单详情接口字段补充

  - fix:查询字段补充

  - fix

  - fix:转义

  - fix

  - fix:新增撤销复议申请单接口

  - fix:补充字段

  - fix:补充字段

  - fix:新增门店分数接口

  - fix:申请单新增筛选条件

  - fix:门店积分接口返回参数修改

  - fix:小程序规则分页查询接口改为Post

  - fix:问题修复

  - fix:十二分导入

  - fix:导入状态部分失败改为失败

  - fix:字段补充

  - fix:异步下Excel导入图片临时文件被清理的问题

  - fix:扣分申请导入图片路径修改并使用CDN

  - fix:导入图片上传oss文件类型修改为图片

  - fix:批量审批

  - fix:批量审批新增备注字段

  - fix:字段补充

  - Merge branch &#39;master&#39; into cc_2021104_twelve_points
    
    # 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-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
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/31
 2026-01-23 06:48:53 +00:00
正新
1b1684f373 Merge #33 into master from cc_20260106_point_update 
铺位管理 地图

* cc_20260106_point_update: (15 commits squashed)

  - feat:铺位改造

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

  - feat:铺位调整

  - feat:新增字段

  - feat:新增字段

  - feat:新增字段

  - feat:点位ID 处理校验规则

  - feat:保存铺位 返回点位ID

  - feat:根据主数据门店编码获取CRM点位数据

  - feat:铺位

  - feat:我的铺位 根据管辖

  - fix:bug 查询

  - fix:PC端点位新增直接关联铺位 bug

  - feat:过滤已开店的铺位

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

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/33
 2026-01-23 06:48:32 +00:00
suzhuhong
44ba00dc38 feat:加盟费待缴费发送时间调整 2026-01-23 14:18:48 +08:00
suzhuhong
96047eeb99 fix:推送合同 2026-01-22 09:30:48 +08:00
suzhuhong
dc22d18322 fix:加盟合同财务阶段 财务之后推送 默认一小时自动分配 2026-01-21 19:04:44 +08:00
suzhuhong
399e46033f fix:加盟阶段bug处理 2026-01-20 10:32:57 +08:00
王非凡
c28515123a Merge #30 into master from cc_20260106_process_change 
fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办，财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/30
 2026-01-19 09:11:34 +00:00
正新
eb9b8bdf00 Merge #29 into master from cc_20260114_selectPoint 
feat:发送通知节点调整

* cc_20260114_selectPoint: (2 commits squashed)

  - 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/29
 2026-01-19 07:11:31 +00:00
正新
e11327f837 Merge #27 into master from cc_20260116_fix 
feat:实训数据去除

* cc_20260116_fix: (3 commits squashed)

  - feat:培训去掉身份证校验

  - fix:带出新管家信息

  - 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/27
 2026-01-19 07:05:53 +00:00
正新
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
suzhuhong
08845557fd feat:开业验收其他角色 返回空 2026-01-14 17:35:56 +08:00
suzhuhong
a9d876b320 feat:开业验收其他角色 返回空 2026-01-14 17:15:06 +08: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
王非凡
e62cd9bff9 Merge #24 into master from cc_20260107_fix_bug 
fix:铺位提交时区域取招商区域

* cc_20260107_fix_bug: (3 commits squashed)

  - 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/24
 2026-01-07 02:01:12 +00:00
suzhuhong
8c8109d535 feat:正新鸡排统管默认都是是 不根据填写的来 2026-01-06 14:16:40 +08:00
suzhuhong
81ea1fbe5f fix:分配 2026-01-06 10:23:43 +08:00
苏竹红
8954d56f45 Merge #23 into master from cc_20260105_fix 
fix:查询招商经理

* cc_20260105_fix: (1 commits squashed)

  - fix:查询招商经理

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/23
 2026-01-05 13:00:42 +00:00
suzhuhong
2e942501be fix:优化查询 2026-01-05 18:10:45 +08:00
suzhuhong
8cdc53c609 fax:订货 2026-01-05 18:02:36 +08:00
suzhuhong
a5068586e0 fax:订货 2026-01-05 17:29:01 +08:00
苏竹红
679b697b1b Merge #21 into master from cc_20260105_fix 
fax:订货

* cc_20260105_fix: (2 commits squashed)

  - feat:代办+督导改为招商经理

  - fax:订货

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/21
 2026-01-05 09:07:48 +00:00
苏竹红
f6b2b4ccf5 Merge #20 into master from cc_20260105_fix 
feat:代办+督导改为招商经理

* cc_20260105_fix: (1 commits squashed)

  - feat:代办+督导改为招商经理

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/20
 2026-01-05 08:39:42 +00:00
suzhuhong
784f34f993 fix：编码发生变动 推送数据 2026-01-02 16:05:27 +08:00
suzhuhong
0fefc7773f fix：招商经理 2026-01-02 12:26:05 +08:00
suzhuhong
8f6ed072d1 fix：内勤看所有管辖范围的数据 2026-01-02 12:15:07 +08:00
suzhuhong
2eaa1533c2 fix:店-招商经理关系 2026-01-02 11:54:49 +08: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
王非凡
4b7a35c96c Merge #18 into master from cc_20251114_minor_req 
fix:订货信息新增订货备注并同步主数据；门店编码变更推送新管家

* cc_20251114_minor_req: (11 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

  - fix:开店管理修改基本信息资料中门店编码发生变化时推送新管家

  - fix:订货信息新增订货备注并同步主数据

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

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/18
 2025-12-26 08:55:27 +00: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
苏竹红
a273b37a73 Merge #14 into master from cc_20251218_opening 
fix:信发查询bug

* cc_20251218_opening: (1 commits squashed)

  - fix:信发查询bug

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/14
 2025-12-18 08:29:16 +00:00
suzhuhong
dd58d70fa2 feta:切换 2025-12-17 14:05:29 +08: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
苏竹红
9769aba30c Merge #12 into master from cc_20251215_xinfa 
feat:先更新

* cc_20251215_xinfa: (2 commits squashed)

  - feat:叫号屏

  - feat:先更新

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/12
 2025-12-15 09:42:30 +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
苏竹红
fa66ef7d01 feat:setStoreCode 2025-12-10 22:37:23 +08:00
苏竹红
654ffe672e feat:setStoreCode 2025-12-10 14:30:48 +08:00
苏竹红
f87b1ca866 feat:小程序版本过低 2025-12-09 18:43:53 +08:00
苏竹红
527be5e13d feat:1 2025-12-09 17:12:53 +08:00
苏竹红
f8e537ed44 feat:1 2025-12-09 17:11:36 +08: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
苏竹红
77da8be294 feat:直营 2025-12-09 11:32:27 +08:00
苏竹红
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