正新
|
dbf25b4be9
|
Merge #56 into master from cc_20260121_store_type
feat：PC 心愿单
* cc_20260121_store_type: (100 commits squashed)
- feat:订单列表
- fix:拜访记录导出
- feat:列表处理
- Merge branch 'cc_20251208_visit' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- fix:加盟缴费调整
- feat:标准店接口处理
- fix:加盟缴费调整
- Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java
- feat:冲突解决
- feat:接口处理
- feat:shopInfo
- fix:PC缴费信息列表过滤已完成缴费信息
- fix:测试接口修改
- Merge branch 'refs/heads/cc_20260126_pingan_wallet' 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 'master' into cc_20260126_pingan_wallet
# Conflicts:
#	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 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	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 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- Merge branch 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
- Merge branch 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java
- feat：PC 心愿单
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/56
|
2026-03-11 09:52:28 +00:00 |
|
正新
|
489d72f06f
|
Merge #52 into master from cc_20260121_store_type
Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
* cc_20260121_store_type: (100 commits squashed)
- Merge branch 'master' into cc_20251208_visit
- feat:订单列表
- feat:订单列表
- fix:拜访记录导出
- feat:列表处理
- Merge branch 'cc_20251208_visit' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- feat:标准店接口处理
- fix:加盟缴费调整
- feat:标准店接口处理
- fix:加盟缴费调整
- Merge branch 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java
- feat:冲突解决
- feat:接口处理
- feat:shopInfo
- fix:PC缴费信息列表过滤已完成缴费信息
- fix:测试接口修改
- Merge branch 'refs/heads/cc_20260126_pingan_wallet' 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 'master' into cc_20260126_pingan_wallet
# Conflicts:
#	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 'master' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	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 'cc_20260126_pingan_wallet' into cc_20260121_store_type
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
- Merge branch 'master' into cc_20260121_store_type
# Conflicts:
#	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 |
|
王非凡
|
f006fea2c2
|
Merge #47 into master from cc_20250922_closeStore_w
闭店
* cc_20250922_closeStore_w: (67 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:闭店申请测试接口
- fix:退款供应商接口补充
- fix:支行列表接口
- fix:错误信息修改
- Merge branch 'master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java
#	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:闭店材料详情接口新增字段
- fix:闭店材料修改单个材料时，去除审批状态
- Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w
- fix:闭店材料详情接口新增模板链接字段
- fix:闭店材料详情新增材料状态转义字段
- Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w
- fix:新管家应退实退金额字段修改
- fix:闭店支行测试环境mock
- fix:redis报错修复
- fix:新管家关店原因字段补充
- fix:新增字段
- fix:字段补充
- fix:小程序新增接口根据闭店申请id获取闭店申请简单信息
- fix:小程序退款信息列表修改
- fix:闭店审批允许管理员审批
- fix:阶段名称修改
- Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java
- fix:闭店记录列表补充审批id；仅在营门店允许发起闭店
- 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/47
|
2026-03-03 10:48:32 +00:00 |
|
王非凡
|
64192e3a1d
|
Merge #49 into master from cc_20260302_login_password
验证码登录
* cc_20260302_login_password: (3 commits squashed)
- 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/49
|
2026-03-03 03:29:16 +00:00 |
|
王非凡
|
7916851939
|
Merge #46 into master from cc_20251208_visit
fix:拜访线索查询逻辑修改
* cc_20251208_visit: (40 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段
- fix:新增字段
- fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- fix:拜访记录导出
- fix:拜访记录导出限制
- fix:拜访记录导出限制
- fix:铺位导出
- fix:铺位及拜访记录导出加锁时机修改
- fix:铺位导出新增字段
- fix:铺位导出新增字段
- fix
- fix:我的铺位导出
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
- 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/46
|
2026-02-26 10:30:35 +00:00 |
|
王非凡
|
17239536b4
|
Merge #44 into master from cc_20251208_visit
fix:我的铺位导出
* cc_20251208_visit: (39 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段
- fix:新增字段
- fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- fix:拜访记录导出
- fix:拜访记录导出限制
- fix:拜访记录导出限制
- fix:铺位导出
- fix:铺位及拜访记录导出加锁时机修改
- fix:铺位导出新增字段
- fix:铺位导出新增字段
- fix
- fix:我的铺位导出
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.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/44
|
2026-02-11 06:39:46 +00:00 |
|
王非凡
|
9b734c66df
|
Merge #43 into master from cc_20251208_visit
拜访记录和铺位导出
* cc_20251208_visit: (37 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段
- fix:新增字段
- fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- 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/43
|
2026-02-10 09:02:43 +00:00 |
|
正新
|
ef2e5ce17f
|
Merge #42 into master from cc_20260123_operations_consultant
feat:加盟合同阶段未完成 不支持调整运营顾问
* cc_20260123_operations_consultant: (3 commits squashed)
- feat:门店转让运营顾问
- Merge branch 'master' into cc_20260123_operations_consultant
- 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/42
|
2026-02-06 07:45:10 +00:00 |
|
王非凡
|
2e5d661b85
|
Merge #40 into master from cc_20251208_visit
fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
* cc_20251208_visit: (25 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- 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/40
|
2026-02-04 09:59:43 +00:00 |
|
王非凡
|
d3a331798c
|
Merge #39 into master from cc_20251208_visit
fix:拜访我的加盟商取消管辖权限过滤
* cc_20251208_visit: (21 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- 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/39
|
2026-02-03 09:53:24 +00:00 |
|
正新
|
83fcb84f9d
|
Merge #37 into master from cc_20251208_visit
feat:拜访字段调整
* cc_20251208_visit: (19 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- 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/37
|
2026-02-02 09:56:33 +00:00 |
|
suzhuhong
|
8de93e7de5
|
feat:reigonId
|
2026-02-02 17:20:18 +08:00 |
|
suzhuhong
|
42b5f27389
|
feat:获取管理下级区域
|
2026-02-02 14:40:05 +08:00 |
|
正新
|
b3b98d980a
|
Merge #36 into master from cc_20260130_store
feat:：门店信息提供
* cc_20260130_store: (1 commits squashed)
- 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/36
|
2026-02-02 06:36:14 +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 'master' into cc_20260113_open
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
- feat:开业代办新增代办预计开业时间
- feat:开业时间查询
- feat:开业
- feat:PC计划开业时间
- Merge branch 'master' into cc_20260113_open
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
- Merge branch 'master' into cc_20260113_open
# Conflicts:
#	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 'refs/heads/master' 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 'master' into cc_2021104_twelve_points
# 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-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
#	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 'refs/heads/master' 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 'master' 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
|
96047eeb99
|
fix:推送合同
|
2026-01-22 09:30:48 +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 |
|
正新
|
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 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:门店详情新增招商所属大区 运营顾问
- fix:获取可选择的大区新增type字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:修改招商所属大区
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:新增分店 修改分店
- feat:operations_consultant
- fix:获取平台建店左侧小窗详情接口新增招商区域名称字段
- feat:合同开始之后需要分配才能触发后续阶段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:新增招商区域名称字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:大区查询添加enableFlag字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:代办查询bug修改
- fix:字段缺失补充
- Merge branch 'master' into cc_20251223_orgChange
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
#	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 'master' 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 'master' 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 'refs/heads/master' into cc_20250916_new
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-local.properties
- fix
- fix:修改http请求工具
- Merge branch 'refs/heads/master' into cc_20250916_new
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	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 'master' 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 '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
- fix:数据看板日营业数据字段修改
- fix:根据手机号获取门店列表 开放接口
- Merge branch 'refs/heads/master' into cc_20251114_minor_req
# Conflicts:
#	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 '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 |
|
王非凡
|
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 '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 |
|
苏竹红
|
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 |
|
