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

4726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
正新
070d771587 Merge #117 into master from cc_20260509_fix 
feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询

* cc_20260509_fix: (1 commits squashed)

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

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/117
 2026-05-09 08:19:49 +00:00
suzhuhong
e813a56927 feat:装修阶段处理 2026-05-09 15:46:51 +08:00
王非凡
764247ab1d Merge #114 into master from cc_20260226_fix 
fix:bug修复

* cc_20260226_fix: (4 commits squashed)

  - fix:建店资料查询收款银行信息区分品牌

  - fix:sql缺失

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

  - fix:bug修复

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/114
 2026-05-08 10:02:06 +00:00
正新
3fe65a48e0 Merge #115 into master from cc_20260507_smz 
feat:AI店 不初始化门店

* cc_20260507_smz: (3 commits squashed)

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

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

  - feat:AI店 不初始化门店

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/115
 2026-05-08 07:11:17 +00:00
正新
585a978f32 Merge #113 into master from cc_20260429_bug 
feat：问题修改

* cc_20260429_bug: (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/113
 2026-04-29 07:00:35 +00:00
正新
0b98bd4bb6 Merge #112 into master from cc_20260429_fix 
feat：门店列表新增标准店店型名称

* cc_20260429_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/112
 2026-04-29 05:39:17 +00:00
王非凡
22fcfc6a90 Merge #111 into master from cc_20260417_bonus 
fix:工资奖金

* cc_20260417_bonus: (28 commits squashed)

  - feat:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:门店实收相关接口

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

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

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

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

  - fix:小程序接口补充

  - fix

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

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

  - fix

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

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

  - fix

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

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

  - fix:规则限制

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

  - fix:查询异常

  - fix:查询异常

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

  - fix:排序

  - fix:排序

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

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/111
 2026-04-27 10:41:08 +00:00
王非凡
97f8a8669c Merge #110 into master from cc_2026_0422_feat_miniMap 
三方接口

* cc_2026_0422_feat_miniMap: (5 commits squashed)

  - feat: 添加机会点考察记录及相关请求和响应类

  - feat: 更新考察记录响应类，添加机会点信息及图片信息结构

  - feat：验签对于List的特殊处理

  - feat: 添加qualified字段到OpportunityInfoResponse以表示考察合格状态

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

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/110
 2026-04-27 10:12:33 +00:00
suzhuhong
19f119bbc6 feat：bug修复 2026-04-24 18:48:44 +08:00
suzhuhong
449f409522 feat：导出 2026-04-24 18:15:25 +08:00
suzhuhong
7385dc1d03 feat：导出 2026-04-24 18:07:03 +08:00
suzhuhong
98233e7032 feat：导出 2026-04-24 18:03:34 +08:00
正新
7c5a2c858d Merge #109 into master from cc_20260420_export 
feat：数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - 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/109
 2026-04-24 09:44:31 +00:00
suzhuhong
d885635728 fix:装修验收调整 可以先装修验收 再加盟商验收 2026-04-23 14:35:57 +08:00
suzhuhong
0fbbc860f6 fix:SHOP_SUB_STAGE_STATUS_91 2026-04-23 14:10:15 +08:00
suzhuhong
4cafc87961 Merge branch 'cc_20260422_feeItemId' 2026-04-23 10:46:31 +08:00
suzhuhong
cb1da9a26f fix:关联分账单 2026-04-23 10:46:02 +08:00
正新
18d5e9c3dd Merge #108 into master from cc_20260422_feeItemId 
fix:调增的时候校验

* cc_20260422_feeItemId: (2 commits squashed)

  - fix:调增的时候校验

  - fix:调增的时候校验

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/108
 2026-04-22 10:49:03 +00:00
suzhuhong
95e6400fa2 fix:调增的时候校验 2026-04-22 18:48:38 +08:00
正新
45766399fd Merge #107 into master from cc_20260422_feeItemId 
fix:调增的时候校验

* cc_20260422_feeItemId: (1 commits squashed)

  - fix:调增的时候校验

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/107
 2026-04-22 10:32:23 +00:00
suzhuhong
11cfdf5b90 fix:调增的时候校验 2026-04-22 18:31:59 +08:00
suzhuhong
e34ca3bdfe Merge remote-tracking branch 'origin/master' 2026-04-22 18:14:25 +08:00
suzhuhong
20c09f49d6 fix:去掉流水号不能为空 2026-04-22 18:13:49 +08:00
正新
e9f37eb71a Merge #106 into master from cc_20260422_feeItemId 
fix:垃圾代码删除

* cc_20260422_feeItemId: (3 commits squashed)

  - fix:费用类型feetId

  - fix:splitType 传入

  - fix:垃圾代码删除

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/106
 2026-04-22 09:42:12 +00:00
suzhuhong
717d4513ee fix:垃圾代码删除 2026-04-22 17:41:28 +08:00
正新
e6797ce3ff Merge #105 into master from cc_20260422_feeItemId 
fix:splitType 传入

* cc_20260422_feeItemId: (2 commits squashed)

  - fix:费用类型feetId

  - fix:splitType 传入

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/105
 2026-04-22 09:29:26 +00:00
suzhuhong
f06519532e fix:splitType 传入 2026-04-22 17:27:15 +08:00
suzhuhong
fca198a835 fix:费用类型feetId 2026-04-22 17:12:02 +08:00
suzhuhong
34d95a3e4d Merge remote-tracking branch 'origin/master' 2026-04-22 16:02:04 +08:00
suzhuhong
106f4bef46 fix:费用类型feetId 2026-04-22 16:01:39 +08:00
正新
7cc4f7e1fa Merge #104 into master from cc_20260422_zhuangxiu 
fix:redis 执行异常

* cc_20260422_zhuangxiu: (2 commits squashed)

  - fix:装修 红圈通回调调整 解除强制限制

  - fix:redis 执行异常

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/104
 2026-04-22 07:50:17 +00:00
suzhuhong
66ab8dc975 fix:redis 执行异常 2026-04-22 15:49:25 +08:00
suzhuhong
78ef7e9440 fix:装修 红圈通回调调整 解除强制限制 2026-04-22 11:11:25 +08:00
suzhuhong
a1da6ca445 feat:密码 2026-04-21 19:31:07 +08:00
suzhuhong
2d22aca884 feat:费用类型 2026-04-21 19:20:36 +08:00
suzhuhong
46937eacc7 feat:费用类型 2026-04-21 17:37:41 +08:00
suzhuhong
45664ddb42 feat:费用类型 2026-04-21 17:35:35 +08:00
suzhuhong
7c64c5d3d5 feat:费用类型 2026-04-21 17:28:34 +08:00
suzhuhong
acd1323afa Merge branch 'cc_20260415_trans' 2026-04-20 16:43:02 +08:00
suzhuhong
cc0659157d feat:提示修改 2026-04-20 10:14:06 +08:00
suzhuhong
39d6b0662b Merge branch 'master' into cc_20260415_trans 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
 2026-04-17 16:59:14 +08:00
suzhuhong
824ef3f90a feat:提示修改 2026-04-17 16:58:59 +08:00
王非凡
8c4f55ab20 Merge #102 into master from cc_20260414_invoice 
开票管理

* cc_20260414_invoice: (6 commits squashed)

  - fix:门店开票信息

  - fix:新增企业开票校验接口；闭店列表新增筛选条件

  - fix

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

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

  - Merge branch &#39;master&#39; into cc_20260414_invoice
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.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/102
 2026-04-17 08:53:50 +00:00
正新
7102127358 Merge #103 into master from cc_20250415_fix 
feat:标准店

* cc_20250415_fix: (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/103
 2026-04-17 08:50:38 +00:00
suzhuhong
fd1584f3e0 feat:分账门店映射 2026-04-17 16:11:14 +08:00
suzhuhong
2caabe3fe1 feat:分账门店映射 2026-04-17 16:03:56 +08:00
suzhuhong
a884919d13 feat:分账处理 2026-04-17 13:41:57 +08:00
suzhuhong
5ccfbc96d7 feat:分账 2026-04-16 18:25:22 +08:00
suzhuhong
d90f8eb2a8 feat:独立分账 2026-04-16 11:03:52 +08:00
suzhuhong
33f47db7e7 Merge branch 'master' into cc_20260415_trans 2026-04-16 09:50:00 +08:00