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

46 Commits

Author SHA1 Message Date
王非凡
22fcfc6a90 Merge #111 into master from cc_20260417_bonus 
fix:工资奖金

* cc_20260417_bonus: (28 commits squashed)

  - feat:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:门店实收相关接口

  - fix:新品销售门店级接口

  - fix:新品销售菜品列表接口；规则新增返回id

  - fix:新品销售菜品详情接口

  - fix:新品销售菜品接口补充

  - fix:小程序接口补充

  - fix

  - fix:新增实收、新品销售测试接口

  - fix:新增实收、新品销售测试接口

  - fix

  - fix:新增门店菜品列表接口

  - fix:同规则下无法新增相同菜品规则；新增小程序门店列表接口

  - fix

  - fix:小程序用户获取来源修改

  - fix:实收规则新增上月日均实收字段

  - fix:规则限制

  - fix:小程序上月日均实收

  - fix:查询异常

  - fix:查询异常

  - fix:菜品员工明细字段赋值异常

  - fix:排序

  - fix:排序

  - fix:员工实收列表新增门店筛选条件

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/111
 2026-04-27 10:41:08 +00:00
王非凡
19bce915ac Merge #99 into master from cc_20260408_close_up 
feat:歇业管理

* cc_20260408_close_up: (18 commits squashed)

  - fix:歇业管理（部分）

  - fix:歇业管理（部分）

  - fix:审批逻辑修改；拒绝审批实现

  - fix:恢复开业申请及审批

  - fix:主流程补充

  - fix:主流程补充

  - fix:字段补充及逻辑修改

  - fix:字段补充

  - fix

  - fix:平台处理新增字段

  - fix

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

  - fix:歇业营业发送短信

  - fix:排序

  - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败

  - fix:申请单详情接口新增品牌字段

  - fix:新增列表筛选条件；审批单状态校验

  - Merge branch &#39;master&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.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/99
 2026-04-15 08:23:40 +00:00
正新
1bbb6f7097 Merge #98 into master from cc_20260408_trans 
feat:mock 处理

* cc_20260408_trans: (22 commits squashed)

  - feat：分账

  - feat：分账接口

  - feat：分账单管理

  - feat：分账管理

  - feat：分账管理

  - feat：userIdName

  - feat：提现

  - feat：调整

  - feat：accountName

  - feat：accountName

  - feat：mock

  - feat：关联门店

  - feat：待充值待认款

  - feat：待充值待认款

  - feat：payer_account_no

  - feat：payeeAccountName

  - feat：payeeAccountNo

  - feat：page

  - feat：枚举

  - feat：接口请求方式调整get->post

  - feat:mock 处理

  - Merge branch &#39;master&#39; into cc_20260408_trans
    
    # 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

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/98
 2026-04-14 09:55:00 +00:00
王非凡
f52e63a938 Merge #92 into master from cc_20250922_closeStore_w 
新管家闭店接口错误信息返回

* cc_20250922_closeStore_w: (81 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:闭店申请测试接口

  - fix:退款供应商接口补充

  - fix:支行列表接口

  - fix:错误信息修改

  - Merge branch &#39;master&#39; into cc_20250922_closeStore_w
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.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/job/XxlJobHandler.java

  - fix:闭店材料详情接口新增字段

  - fix:闭店材料修改单个材料时，去除审批状态

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

  - fix:闭店材料详情接口新增模板链接字段

  - fix:闭店材料详情新增材料状态转义字段

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

  - fix:新管家应退实退金额字段修改

  - fix:闭店支行测试环境mock

  - fix:redis报错修复

  - fix:新管家关店原因字段补充

  - fix:新增字段

  - fix:字段补充

  - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息

  - 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/enums/close/CloseStoreSubStageStatusEnum.java

  - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店

  - fix:提交新管家字段取值逻辑修改

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

  - fix:闭店定时任务过滤闭店状态补充

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

  - fix:闭店材料新增字段

  - fix

  - fix:小程序闭店材料详情新增字段

  - fix:闭店流程流转校验除授权书外是否已邮寄

  - fix:营帐通JWT生成

  - fix:营帐通JWT改为post

  - fix:修改secret

  - fix:配置

  - fix:闭店新管家接口错误信息返回

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

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

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/92
 2026-04-13 09:27:52 +00:00
正新
489d72f06f Merge #52 into master from cc_20260121_store_type 
Merge branch &#39;cc_20260126_pingan_wallet&#39; into cc_20260121_store_type

* cc_20260121_store_type: (100 commits squashed)

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

  - feat:订单列表

  - feat:订单列表

  - fix:拜访记录导出

  - feat:列表处理

  - Merge branch &#39;cc_20251208_visit&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - feat:标准店接口处理

  - fix:加盟缴费调整

  - feat:标准店接口处理

  - fix:加盟缴费调整

  - Merge branch &#39;cc_20260126_pingan_wallet&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java

  - feat:冲突解决

  - feat:接口处理

  - feat:shopInfo

  - fix:PC缴费信息列表过滤已完成缴费信息

  - fix:测试接口修改

  - Merge branch &#39;refs/heads/cc_20260126_pingan_wallet&#39; into cc_20260121_store_type

  - fix:测试接口修改

  - feat:接口

  - feat:接口调整

  - feat:注释调整

  - feat：key 调整

  - feat：订单ID

  - feat：日志打印

  - feat：选择标准店型

  - feat:useStandardStore

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:标准店没有缴费阶段

  - feat:阶段调整

  - fix:修复加盟缴费流程流转错误

  - feat:费用类型ID

  - feat:锁释放

  - feat:分账状态

  - fix:加盟签约合同数据补充

  - feat:排序

  - feat:选项单位

  - feat:选项单位

  - feat:选项单位

  - feat:选项单位

  - feat:option_unit

  - feat:option_unit

  - feat:更新调整

  - feat:视频非必填

  - feat:optionUnit

  - fix:转义

  - Merge branch &#39;master&#39; into cc_20260126_pingan_wallet
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

  - feat:同一配置项下只能设置一个默认选项

  - feat:数量支持小数，新增首次订货字段

  - fix:提交及修改校验合计缴费金额和分账总金额是否相同

  - feat：queryPage

  - feat：defaultQuantity 改为 BigDecimal

  - feat：defaultQuantity 改为 BigDecimal

  - feat：门店预约到店

  - feat：门店预约到店 取消预约

  - feat：门店预约到店 手机号

  - feat：添加原价

  - feat：添加原价

  - feat：添加原价

  - feat：字典表 remark

  - Merge branch &#39;master&#39; into cc_20260121_store_type
    
    # 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/FileTypeEnum.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java

  - feat：字典表 remark

  - feat：服务人员手机号

  - feat：价格计算调整店型优惠价*默认数量 + 原价 *（选择数量-默认数量）

  - fix:补充钱包账单推送新管家流程

  - fix:账单推送钱包支付类型payWay由1改为2

  - feat：同一配置项下只能设置一个默认选项 限制去掉

  - fix:平安钱包分账信息改为非必填

  - feat：同一配置项只能选择一个选项 限制去掉

  - feat：心愿单

  - feat：心愿单

  - feat：心愿单接口调整

  - feat：心愿单接口调整

  - feat：心愿单接口调整

  - feat：批量更新数据

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：查询店型已配置的选项绑定 新增顶部预览图

  - feat：配置大类

  - feat：配置大类

  - feat：价格优化

  - feat：阶段审批处理

  - fix:删除设计费-立规

  - feat：配置大项 配置项接口改造

  - feat：配置大项 配置项接口改造

  - feat：handleAudit

  - feat：新增code

  - feat：categoryId

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - feat：心愿单接口更新

  - Merge branch &#39;cc_20260126_pingan_wallet&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

  - Merge branch &#39;master&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.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/52
 2026-03-10 14:13:03 +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
苏竹红
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
苏竹红
bd1486c08a feat:验签调整 2025-11-21 15:18:06 +08:00
苏竹红
d74f4a5c19 feat:验签调整 2025-11-21 12:41:52 +08:00
苏竹红
7703e4ef09 feat:营账通key 2025-11-18 15:08:35 +08:00
苏竹红
579bef59cd feat:优化 2025-11-18 10:28:47 +08:00
wangff
9256332d11 Merge branch 'refs/heads/master' into cc_20251112_wallet 
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
 2025-11-14 13:13:52 +08:00
苏竹红
9f042b9dbd feat:钱包接口对接 2025-11-13 18:44:19 +08:00
苏竹红
368f97774a feat:信发 2025-11-12 13:51:46 +08:00
苏竹红
7f342a168d feat:OkHttpClient 2025-11-11 18:16:21 +08:00
苏竹红
05210119f1 feat:信发 2025-11-05 17:56:16 +08:00
苏竹红
f3dc39b911 feat:信发 2025-11-05 17:47:47 +08:00
苏竹红
e10525cedd feat:getStoreXinFaDeviceDetail 2025-11-05 10:04:18 +08:00
苏竹红
631f2a189a Merge branch 'master' into cc_20251010_wxnotice 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
 2025-10-29 19:44:14 +08:00
苏竹红
b4365a795c feat:appid 2025-10-28 10:02:43 +08:00
wangff
1cb6e26017 Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
 2025-10-15 11:28:38 +08:00
苏竹红
0545fee340 feat:通知配置 2025-10-15 11:12:22 +08:00
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +08:00
wangff
0d42743778 Merge branch 'cc_20250909_new' into cc_20250903_big_screen 2025-09-09 10:46:29 +08:00
wangff
f4cbe548c7 fix:配置 2025-09-04 14:33:00 +08:00
苏竹红
8219e8b869 Merge branch 'cc_20250813_storeMaster' into 'master' 
Cc 20250813 store master

See merge request hangzhou/java/custom_zxjp!154
 2025-08-21 09:10:08 +00:00
苏竹红
bc48826339 feat:1 2025-08-21 13:48:44 +08:00
苏竹红
64c6fa229a feat:加盟费处理 2025-08-20 14:37:20 +08:00
苏竹红
d81b4725e0 feat:加盟费处理 2025-08-20 14:32:47 +08:00
shuo.wang
71591e985a 装修调整 2025-08-06 17:42:34 +08:00
shuo.wang
2859a8bc75 feat 2025-07-25 10:20:09 +08:00
shuo.wang
e87bba019f ab 2025-07-11 10:41:22 +08:00
shuo.wang
d58623a6c2 ab 2025-07-11 10:40:51 +08:00
shuo.wang
52af6ba903 多品牌使用 2024-11-05 18:23:00 +08:00
zhangchenbiao
5a0996ed17 修改rocket mq ak sk 2024-09-11 17:07:38 +08:00
zhangchenbiao
88c2823760 修改配置 2024-05-28 11:32:20 +08:00
zhangchenbiao
a1fbfa2e52 修改配置 2024-05-08 17:30:51 +08:00
zhangchenbiao
6fdc4f6c5e 通知更改 2024-05-08 14:58:45 +08:00
zhangchenbiao
73430871cd fix 2024-05-07 14:26:21 +08:00
wangxiaopeng
a872a59f39 ab测试环境小程序 2024-04-28 11:33:52 +08:00
wangxiaopeng
aa3b67a091 wx997f2206e276e513 2024-04-23 17:26:24 +08:00
zhangchenbiao
e59da5aa86 新增短信 2024-04-10 16:05:10 +08:00
苏竹红
54936e8068 配置 2024-04-09 11:14:07 +08:00
zhangchenbiao
a987169949 update 2024-03-12 16:49:14 +08:00
zhangchenbiao
f58257a673 update 2024-03-12 14:51:40 +08:00