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

4660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
王非凡
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
苏竹红
a444130b21 feat:bot 2025-12-09 15:39:43 +08:00
苏竹红
77da8be294 feat:直营 2025-12-09 11:32:27 +08:00
苏竹红
d7c8dd21fd Merge #6 into master from cc_20251203_bugfix 
feat:getPosToken

* cc_20251203_bugfix: (1 commits squashed)

  - feat:getPosToken

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/6
 2025-12-09 03:12:33 +00:00
苏竹红
2237ed3f4a feat:openBasicInfoDTO 2025-12-05 14:07:43 +08:00
苏竹红
d3d6ffb9ce feat:openBasicInfoDTO 2025-12-04 19:16:04 +08:00
王非凡
c812021fad Merge #5 into master from cc_20251114_minor_req 
fix:菜品市场数据新增字段

* cc_20251114_minor_req: (5 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch &#39;master&#39; into cc_20251114_minor_req
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

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/5
 2025-12-04 10:22:48 +00:00
苏竹红
7b8f220c26 Merge remote-tracking branch 'origin/master' 2025-12-04 18:22:25 +08:00
苏竹红
26d9dd7800 feat:openBasicInfoDTO 2025-12-04 18:22:17 +08:00
王非凡
9a62d2e0c0 Merge #2 into master from cc_20251112_wallet 
fix:临时关闭营帐通建店推送

* cc_20251112_wallet: (2 commits squashed)

  - 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/2
 2025-12-04 09:48:29 +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 &#39;refs/heads/master&#39; 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
苏竹红
43f37734b4 feat:openBasicInfoDTO 2025-12-04 17:46:24 +08:00
苏竹红
30ae3fb841 feat:正新鸡排优惠 2025-12-04 16:24:44 +08:00
苏竹红
1e6fcd683c feat:discountAmount 2025-12-04 16:11:53 +08:00
苏竹红
5f2fcf944e feat:regionName 2025-12-04 14:53:48 +08:00
苏竹红
fb01212593 feat:合同数据 2025-12-04 14:27:47 +08:00
苏竹红
b715feef7f feat:门店id 门店编号 限制 2025-12-04 13:50:07 +08:00
苏竹红
1a9138aaa4 feat:getCashierFee 2025-12-04 10:21:57 +08:00
苏竹红
3e2b89e254 feat:开户支行不为空 2025-12-03 19:55:47 +08: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
苏竹红
580c019e34 Merge branch 'cc_2021104_twelve_points' into 'master' 
Cc 2021104 twelve points

See merge request hangzhou/java/custom_zxjp!201
 2025-12-02 11:35:47 +00:00
wangff
08f7671427 fix 2025-12-02 19:35:17 +08: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
苏竹红
44ffaf30bf Merge branch 'cc_20250905_franchiseAgreement' into 'master' 
feat:正新三明治

See merge request hangzhou/java/custom_zxjp!200
 2025-12-02 10:52:41 +00:00
苏竹红
e529a36c32 feat:正新三明治 2025-12-02 18:49:50 +08:00
苏竹红
c9efff2456 feat:contractEndTime 2025-12-02 18:35:13 +08:00
苏竹红
82dc2cd47f feat:待缴费才能操作 2025-12-02 18:04:05 +08:00
苏竹红
7d69b4ce05 Merge branch 'cc_20250905_franchiseAgreement' into 'master' 
Cc 20250905 franchise agreement

See merge request hangzhou/java/custom_zxjp!199
 2025-12-02 09:56:59 +00:00
苏竹红
8091a61917 Merge branch 'cc_20251114_minor_req' into 'master' 
fix:门店开放接口新增省市区字段

See merge request hangzhou/java/custom_zxjp!198
 2025-12-02 09:55:44 +00:00
wangff
c1e917ecda fix:门店开放接口新增省市区字段 2025-12-02 15:36:50 +08:00
苏竹红
597baa82b9 feat:合同 2025-12-02 14:03:57 +08:00
苏竹红
8b250b7449 feat:合同 2025-12-02 13:46:57 +08:00
苏竹红
7dd72ac50c Merge branch 'cc_20251104_xinfa' into 'master' 
信发

See merge request hangzhou/java/custom_zxjp!197
 2025-12-01 08:48:03 +00:00
wangff
d062009c56 fix 2025-12-01 16:37:40 +08:00
苏竹红
587800ea9d feat:WALLET_API_ERROR 2025-12-01 15:24:12 +08:00
苏竹红
71c6446cd3 feat:门店编码查询 2025-12-01 13:56:39 +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
苏竹红
09ef3693a1 feat:门店编码查询 2025-11-28 16:58:23 +08:00
苏竹红
0f3bafd5ee Merge branch 'cc_20251112_wallet' into 'master' 
Cc 20251112 wallet

See merge request hangzhou/java/custom_zxjp!196
 2025-11-28 08:47:13 +00:00
苏竹红
23eb77a317 feat:旗舰店 2025-11-28 15:40:57 +08:00
苏竹红
d431a0205f feat:合同 2025-11-28 11:18:39 +08:00
苏竹红
6727fe6931 feat:合同 2025-11-28 11:14:31 +08:00
苏竹红
cea7fe70ea feat:账户余额 2025-11-28 09:11:44 +08:00
苏竹红
2531761830 feat:existPassword 2025-11-27 20:28:51 +08:00
苏竹红
85761cef63 feat:setBusinessLicensePhoto 2025-11-27 18:32:24 +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
苏竹红
3e86c33b66 Merge branch 'cc_20251114_minor_req' into 'master' 
fix:门店列表开放接口新增字段

See merge request hangzhou/java/custom_zxjp!193
 2025-11-27 08:38:57 +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
苏竹红
d3f560e30e Merge branch 'cc_20251124_token' into 'master' 
feat:token

See merge request hangzhou/java/custom_zxjp!195
 2025-11-27 08:38:47 +00:00