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

4701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
suzhuhong
5b79072fb1 feat：允许0 2026-04-08 10:07:27 +08:00
suzhuhong
c85e78527d feat：允许0 2026-04-08 09:51:12 +08:00
王非凡
321939c954 Merge #87 into master from cc_20260330_fix 
fix:退款账户类型全部改为CORP

* cc_20260330_fix: (12 commits squashed)

  - fix:日志

  - fix:问题修复

  - fix:闭店二级审批改为运营片区总顾问

  - fix:在营和暂停营业允许发起闭店

  - fix:新管家支行接口路径修改

  - Merge branch 'master' into cc_20260330_fix
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java

  - fix:新管家退款单字段补充修改

  - fix:新管家退款单字段补充修改

  - Merge branch 'master' into cc_20260330_fix
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:退款账户类型全部改为CORP

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/87
 2026-04-07 09:46:54 +00:00
suzhuhong
a3889ec7cd feat：管理订单 2026-04-04 17:01:24 +08:00
suzhuhong
c551119f4b feat：管理订单 2026-04-04 09:59:59 +08:00
suzhuhong
777c0c2126 feat：接口调整 2026-04-03 15:16:26 +08:00
王非凡
ba382bc1fe Merge #83 into master from cc_20260330_fix 
fix:新管家退款单字段补充修改；三明治门店详细地址获取逻辑修改

* cc_20260330_fix: (12 commits squashed)

  - fix:日志

  - fix:问题修复

  - fix:闭店二级审批改为运营片区总顾问

  - fix:在营和暂停营业允许发起闭店

  - fix:新管家支行接口路径修改

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

  - fix:新管家退款单字段补充修改

  - fix:新管家退款单字段补充修改

  - Merge branch &#39;master&#39; into cc_20260330_fix
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:三明治铺位详细地址更新到门店地址字段

  - fix:退款账户类型全部改为CORP

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/83
 2026-04-02 09:50:07 +00:00
王非凡
8587957f2b Merge #85 into master from cc_20260331_material_blacklist 
fix:小程序门店物料黑名单接口

* cc_20260331_material_blacklist: (1 commits squashed)

  - 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/85
 2026-04-02 09:13:39 +00:00
正新
6f34da2fb4 Merge #86 into master from cc_20260401_bugfix 
feat：接口调整

* cc_20260401_bugfix: (5 commits squashed)

  - feat：推送数据

  - feat：装修团队

  - feat：开始时间为空

  - feat：接口调整

  - Merge branch &#39;master&#39; into cc_20260401_bugfix
    
    # 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/86
 2026-04-02 09:13:29 +00:00
正新
2ca289b27e Merge #84 into master from cc_20260401_bugfix 
feat：装修团队

* cc_20260401_bugfix: (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/84
 2026-04-02 01:29:07 +00:00
suzhuhong
c42752c945 feat：推送数据 2026-04-01 11:29:38 +08:00
suzhuhong
d67ea88d14 feat：推送bug修改 2026-03-31 18:01:23 +08:00
suzhuhong
8786d728a5 feat：大区内勤确认 2026-03-31 13:48:26 +08:00
王非凡
8fd44d2b69 Merge #82 into master from cc_20260330_fix 
fix:新管家退款单字段补充修改

* cc_20260330_fix: (7 commits squashed)

  - fix:日志

  - fix:问题修复

  - fix:闭店二级审批改为运营片区总顾问

  - fix:在营和暂停营业允许发起闭店

  - fix:新管家支行接口路径修改

  - Merge branch &#39;master&#39; into cc_20260330_fix
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.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/82
 2026-03-31 03:27:32 +00:00
suzhuhong
6ca6a3bb72 feat：bug 2026-03-30 21:48:14 +08:00
正新
310ae0be7d Merge #81 into master from cc_20260320_standard_expense_Type 
feat：时间调整

* cc_20260320_standard_expense_Type: (40 commits squashed)

  - feat：费用类型新增

  - feat：费用类型

  - feat：默认数据

  - feat：类型调整

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

  - feat：逻辑调整

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

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：查询预分账调整

  - feat：查询预分账调整

  - feat：心愿单 校验调整

  - feat：心愿单 校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送 优化推送 当系统使用费为零的时候 推送数据重置的问题

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

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：数据调整

  - feat：新增系统服务费

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - 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/81
 2026-03-30 13:20:15 +00:00
王非凡
d03bdb7cb0 Merge #80 into master from cc_20260330_fix 
fix:新管家支行接口路径修改

* cc_20260330_fix: (6 commits squashed)

  - fix:日志

  - fix:问题修复

  - fix:闭店二级审批改为运营片区总顾问

  - fix:在营和暂停营业允许发起闭店

  - fix:新管家支行接口路径修改

  - Merge branch &#39;master&#39; into cc_20260330_fix
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.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/80
 2026-03-30 10:29:11 +00:00
王非凡
a3125e6b9e Merge #79 into master from cc_20260330_fix 
fix:新管家支行查询接口问题修复

* cc_20260330_fix: (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/79
 2026-03-30 09:11:02 +00:00
王非凡
6515403be4 Merge #78 into master from cc_20260330_fix 
fix:日志

* cc_20260330_fix: (1 commits squashed)

  - 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/78
 2026-03-30 07:48:17 +00:00
suzhuhong
7ad6cc71bb feat：门店经纬度更新 2026-03-29 18:19:57 +08:00
suzhuhong
00fa065606 feat：门店经纬度更新 2026-03-29 18:00:36 +08:00
suzhuhong
89f3d453aa feat：门店经纬度更新 2026-03-29 17:48:50 +08:00
suzhuhong
68ce9faf5e feat：门店经纬度更新 2026-03-29 17:32:38 +08:00
suzhuhong
6ed1c893c6 feat：门店经纬度更新 2026-03-29 17:26:16 +08:00
正新
cd49e78f3d Merge #77 into master from cc_20260329_fix 
feat：门店经纬度更新

* cc_20260329_fix: (3 commits squashed)

  - feat：门店经纬度更新

  - feat：门店经纬度更新

  - Merge branch &#39;master&#39; into cc_20260329_fix
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml

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/77
 2026-03-29 09:15:36 +00:00
正新
e49e8d4fc3 Merge #76 into master from cc_20260329_fix 
feat：门店经纬度更新

* cc_20260329_fix: (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/76
 2026-03-29 09:08:21 +00:00
正新
ba03a9ac7a Merge #75 into master from cc_20260327_fix 
feat：副总裁调整

* cc_20260327_fix: (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/75
 2026-03-29 07:07:13 +00:00
王非凡
14aa3507b7 Merge #74 into master from cc_20260324_decoration_update 
feat:新增修改装修信息接口

* cc_20260324_decoration_update: (2 commits squashed)

  - feat:新增修改装修信息接口

  - 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/74
 2026-03-25 09:38:34 +00:00
王非凡
1f3d5a0df7 Merge #72 into master from cc_20260323_minor_req 
fix:钱包线上支付校验使用网商钱包账户;分账信息初始化状态修改

* cc_20260323_minor_req: (7 commits squashed)

  - fix:机会点接口新增筛选条件

  - fix:字段隐藏

  - fix:字段隐藏

  - fix:初始化钱包分账信息状态改为未支付

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

  - 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/72
 2026-03-24 09:36:35 +00:00
正新
a13ba2175c Merge #71 into master from cc_20260318_wishlist 
feat：订单待确认 审批流去掉

* cc_20260318_wishlist: (22 commits squashed)

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口 查询当前门店铺位绑定的心愿单

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

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

  - feat：代码merge 错误处理

  - feat：新增storeType

  - feat：查询逻辑调整

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：心愿单状态筛选

  - feat：查询当前门店铺位绑定的心愿单 mini

  - feat：bug修复

  - 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/71
 2026-03-23 11:51:20 +00:00
正新
d50a31d044 Merge #70 into master from cc_20260323_fix 
feat：数量可以为0

* cc_20260323_fix: (2 commits squashed)

  - feat：数量可以为0

  - feat：数量可以为0

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/70
 2026-03-23 09:33:32 +00:00
王非凡
728bd0f8ef Merge #68 into master from cc_20260313_ws_wallet 
网商钱包分账对接

* cc_20260313_ws_wallet: (9 commits squashed)

  - fix:新店开通网商钱包

  - fix:网商钱包开通回调修改

  - fix

  - fix

  - fix:关闭网商开通回调接口验签

  - Merge branch &#39;master&#39; into cc_20260313_ws_wallet
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java

  - 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/68
 2026-03-23 09:00:24 +00:00
王非凡
3b1e6f6cb9 Merge #69 into master from cc_20250922_closeStore_w 
fix:闭店材料字段新增

* cc_20250922_closeStore_w: (74 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:闭店流程流转校验除授权书外是否已邮寄

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/69
 2026-03-23 09:00:10 +00:00
王非凡
e76ca47901 Merge #67 into master from cc_20260320_openapi_modify 
fix:获取门店信息开放接口返回门店运营顾问

* cc_20260320_openapi_modify: (1 commits squashed)

  - 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/67
 2026-03-23 08:59:45 +00:00
suzhuhong
4f4cf2b928 feat：代码merge 错误处理 2026-03-19 16:44:58 +08:00
suzhuhong
6bfab2c802 feat：心愿单接口 状态 2026-03-19 16:41:41 +08:00
suzhuhong
1f8a79d646 feat：心愿单接口 状态 2026-03-19 16:40:49 +08:00
王非凡
76d0c0bf32 Merge #66 into master from cc_20260305_opPlan_remove 
fix:加盟合同签约完成后门店编码修改时推送新管家

* cc_20260305_opPlan_remove: (3 commits squashed)

  - fix:开业运营方案阶段不初始化

  - fix:加盟合同签约完成后门店编码修改时推送新管家

  - Merge branch &#39;master&#39; into cc_20260305_opPlan_remove
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.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/66
 2026-03-18 09:05:58 +00:00
正新
6e2861b3f0 Merge #65 into master from cc_20260317_fix 
feat：建店信息 副总裁

* cc_20260317_fix: (3 commits squashed)

  - 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/65
 2026-03-17 08:54:48 +00:00
王非凡
f01cf2886e Merge #64 into master from cc_20260313_ws_wallet 
fix:关闭网商开通回调接口验签

* cc_20260313_ws_wallet: (6 commits squashed)

  - fix:新店开通网商钱包

  - fix:网商钱包开通回调修改

  - fix

  - fix

  - fix:关闭网商开通回调接口验签

  - Merge branch &#39;master&#39; into cc_20260313_ws_wallet
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.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/64
 2026-03-13 15:45:50 +00:00
正新
f1f0295906 Merge #63 into master from cc_20260313_standard 
feat：新增筛选

* cc_20260313_standard: (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/63
 2026-03-13 14:53:25 +00:00
王非凡
70b41d6783 Merge #62 into master from cc_20260313_ws_wallet 
网商

* cc_20260313_ws_wallet: (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/62
 2026-03-13 14:28:55 +00:00
suzhuhong
73c9bc7368 feat：PC 心愿单 2026-03-13 13:54:43 +08:00
正新
3a9e8c4709 Merge #61 into master from cc_20260121_store_type 
feat：PC 心愿单

* cc_20260121_store_type: (100 commits squashed)

  - 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

  - Merge branch &#39;master&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java

  - feat：PC 心愿单

  - feat：PC 心愿单

  - feat：PC 心愿单

  - feat：PC 心愿单

  - feat：PC 心愿单

  - Merge branch &#39;master&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/order/StoreWishlistDAO.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/StoreWishlistMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/order/StoreWishlistMapper.xml
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/order/WishAllListRequest.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreWishlistListVO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/order/MiniStoreOrderService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/StoreOrderController.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/61
 2026-03-12 09:35:48 +00:00
王非凡
3b8ed0a3b8 Merge #59 into master from cc_2021104_twelve_points 
fix:十二分问题修复

* cc_2021104_twelve_points: (58 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

  - fix:字典项新增排序、编辑删除权限、关联字典项

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

  - fix:十二分值-扣分列表申请复议截止日期格式

  - fix:去除appealEndDate格式校验

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

  - Merge branch &#39;cc_20260128_dict_update&#39; into cc_2021104_twelve_points

  - fix:字典回显包含已删除字典项

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

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

  - fix:去除惩处单审批阶段；复议申请单证明图片非必填

  - fix:复议拒绝后惩处单直接生效

  - fix:扣分申请单证明图片改为非必填

  - fix

  - fix:字段转义

  - fix:惩处待处理包含带生效数据

  - fix:字段转义

  - fix:警告单金额和积分初始化为0

  - fix

  - fix:小程序接口字段转义

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

  - fix:十二分审批记录展示待审批人

  - fix

  - fix:惩处单复议申请逾期检查改为延时队列

  - Merge branch &#39;refs/heads/master&#39; into cc_2021104_twelve_points
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.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/59
 2026-03-12 09:29:50 +00:00
王非凡
170e77fd14 Merge #58 into master from cc_20260311_optimize 
fix:无需鉴权直接返回开通成功的

* cc_20260311_optimize: (8 commits squashed)

  - fix:未分配招商区域处理

  - fix

  - fix:线下收款银行配置默认值

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

  - fix:账户别称修改

  - fix:无需鉴权直接返回开通成功的，阶段状态流转

  - fix:无需鉴权直接返回开通成功的

  - Merge branch &#39;master&#39; into cc_20260311_optimize
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.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/58
 2026-03-12 06:02:36 +00:00
王非凡
dbac467b02 Merge #57 into master from cc_20260311_optimize 
fix:无需鉴权直接返回开通成功的，阶段状态流转

* cc_20260311_optimize: (6 commits squashed)

  - fix:未分配招商区域处理

  - fix

  - fix:线下收款银行配置默认值

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

  - 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/57
 2026-03-12 01:59:56 +00:00
正新
dbf25b4be9 Merge #56 into master from cc_20260121_store_type 
feat：PC 心愿单

* cc_20260121_store_type: (100 commits squashed)

  - 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

  - Merge branch &#39;master&#39; into cc_20260121_store_type
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java
    #&#9;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
王非凡
b9690590bf Merge #55 into master from cc_20260311_optimize 
fix:线下收款银行配置默认值；钱包账户别名修改

* cc_20260311_optimize: (5 commits squashed)

  - fix:未分配招商区域处理

  - fix

  - fix:线下收款银行配置默认值

  - Merge branch &#39;master&#39; into cc_20260311_optimize
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.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/55
 2026-03-11 09:51:45 +00:00
suzhuhong
4371d9147c feat：调整 2026-03-11 12:02:47 +08:00