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

30 Commits

Author SHA1 Message Date
正新
8caf3b1a6a Merge #132 into master from revert-56b85c33-20f063dc 
Revert commit "Merge #128 into master from cc_20250512_uploadRentContract

* revert-56b85c33-20f063dc: (1 commits squashed)

  - Revert commit "Merge #128 into master from cc_20250512_uploadRentContract
    
    This reverts change request#128

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/132
 2026-05-12 09:56:16 +00:00
正新
20f063dc55 Merge #128 into master from cc_20250512_uploadRentContract 
feat:租赁合同新增审批记录

* cc_20250512_uploadRentContract: (100 commits squashed)

  - fix:计划闭店时间修改

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

  - feat：新签调整

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

  - fix:闭店信息新增初审、复审、终审时间字段；闭店管理列表新增返回字段

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

  - feat：招商

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

  - feat：招商

  - feat：招商

  - feat：招商

  - fix:删除字段

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

  - feat：招商

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

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

  - feat：数据同步 名称新增MX 等前缀

  - feat：上海魔盒未来食品有限公司

  - fix:修改查询逻辑

  - Merge branch &#39;cc_20260428_store_report&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - feat：id

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

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

  - Merge branch &#39;cc_20260507_smz&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java

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

  - feat：翻新

  - feat:用户列表为空

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:用户列表为空

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:RenewalRenovateApprovalVO

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak

  - feat:招商副总裁

  - Merge branch &#39;cc_20260427_rnewal&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java

  - feat:招商副总裁审核

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:费用单调整

  - feat:招商经理

  - feat:招商经理

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:费用调整

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

  - fix:bug修复

  - fix:未开业门店试营业日期

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#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/job/XxlJobHandler.java

  - feat:新增审批

  - fix:开业日期报备不同步门店状态

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak

  - fix:字段名称修改

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

  - fix:闭店中止新增审批记录

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

  - feat:费用调整单

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:调整单

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - fix:试营业测试接口

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

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

  - feat:page

  - feat:自动分账

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

  - fix:私域二维码门店绑定关系缓存改为7天

  - Merge branch &#39;cc_20260226_fix&#39; into cc_20250514_common_bak

  - feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询

  - Merge branch &#39;cc_20260509_fix&#39; into cc_20250514_common_bak

  - fix:修改门店开业日期判断条件修改

  - Merge branch &#39;cc_20260508_open_store_req&#39; into cc_20250514_common_bak

  - feat:填写添加门店

  - feat:建店代办处理

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

  - feat:userAuthMappingService

  - feat:addShopDecorationLog

  - Merge branch &#39;cc_20260506_newsign&#39; into cc_20250514_common_bak

  - feat:待采购确认 审批流程

  - feat:问题修复

  - Merge branch &#39;cc_20260511_fix&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.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/ShopStageInfoMapper.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - feat:问题修复

  - feat:问题修复

  - feat:流水查询条件

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

  - feat：费用流水筛选条件

  - fix:歇业管理逻辑修改

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

  - feat：getAdjustAmount

  - Merge branch &#39;cc_20260511_close_up_modify&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#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-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.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/closeup/CloseUpPlatformMapper.java
    #&#9;coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
    #&#9;coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.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:合并冲突

  - Merge branch &#39;cc_20260408_close_up&#39; into cc_20250514_common_bak
    
    # Conflicts:
    #&#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-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:合并冲突

  - Merge branch &#39;cc_20260508_adjustment&#39; into cc_20250514_common_bak

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

  - fix:火码歇业时机修改

  - Merge branch &#39;cc_20260408_close_up&#39; into cc_20250514_common_bak

  - feat:租赁合同新增审批记录

  - Merge branch &#39;master&#39; into cc_20250512_uploadRentContract
    
    # Conflicts:
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
    #&#9;coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

  - feat:merge冲突

  - feat:merge冲突

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/128
 2026-05-12 09:01:35 +00:00
苏竹红
773230dabf feat:加盟费处理 2025-08-20 14:25:57 +08:00
苏竹红
dea98ee193 feat：线上bug紧急修复 2025-06-13 15:46:34 +08:00
shuo.wang
d71dfb05c5 //审批拒绝阶段 数据处理 2025-06-06 11:34:09 +08:00
shuo.wang
86611d2178 数据处理代码 2025-06-04 16:58:16 +08:00
shuo.wang
2788afba17 处理冲突 2025-06-04 14:35:28 +08:00
shuo.wang
e14806db30 数据处理 2025-06-04 14:30:04 +08:00
苏竹红
747858b9cf feat:回调 2025-06-04 14:29:20 +08:00
shuo.wang
51a3da146c fix 2025-06-04 09:40:00 +08:00
shuo.wang
c014841e8c 加盟费改造 2025-05-30 18:17:57 +08:00
shuo.wang
1e323efe7c 加盟费代码改造 2025-05-29 13:36:24 +08:00
shuo.wang
10ca7a1845 fix 2025-02-21 16:28:19 +08:00
shuo.wang
be7fee6b53 fix 2025-02-21 16:03:17 +08:00
shuo.wang
8b485f1840 加盟费付款增加字段，发票回传增加字段 2025-02-11 15:33:07 +08:00
苏竹红
18a9982182 lineSource 2024-05-10 11:16:01 +08:00
shuo.wang
64119c59ee 完成部分TODO修改bug 2024-05-09 14:18:44 +08:00
shuo.wang
e54a45143b 完成部分TODO 2024-05-08 20:29:43 +08:00
苏竹红
0b53b629b5 Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-08 11:34:37 +08:00
苏竹红
2d88827ecb 提交时间 2024-05-08 11:34:26 +08:00
guohb
c0d966423e fix review 2024-05-08 11:29:36 +08:00
guohb
7dec4b8c47 fix 2024-05-07 18:12:33 +08:00
guohb
f3d5a3eb99 fix 2024-05-07 14:55:18 +08:00
guohb
d58f2aeba7 支付新增shopId 2024-05-07 14:35:08 +08:00
zhangchenbiao
e3879275f3 fix 2024-04-30 15:10:27 +08:00
shuo.wang
9539790a34 新店装修阶段2.0+修改查询运营列表PSOT 2024-04-29 15:40:11 +08:00
guohb
3db1d96515 feat:支付 2024-04-25 17:34:44 +08:00
guohb
ef696c397a 重新缴费 2024-04-03 15:11:47 +08:00
苏竹红
f9e1d01c6d 待处理列表 2024-04-01 17:42:16 +08:00
wangxiaopeng
0ae1df7bbd 区域配置、提交意向金、银行接口 2024-03-28 16:38:27 +08:00