|
|
25e16e41eb
|
修改bug：会员等级不同地方显示不同
|
2025-02-28 19:20:56 +08:00 |
|
|
|
cd6dd0280f
|
修改bug：会员升级，现金分润
|
2025-02-28 17:47:38 +08:00 |
|
|
|
f89a84f3ef
|
修改bug：注册新账号默认等级为会员
|
2025-02-28 16:45:03 +08:00 |
|
|
|
412c017c96
|
修改bug
|
2025-02-28 16:15:03 +08:00 |
|
|
|
d64f5b4bbb
|
修改我的钱包bug
|
2025-02-27 15:23:39 +08:00 |
|
|
|
392da5a396
|
修改bug
|
2025-02-26 15:42:58 +08:00 |
|
|
|
565c82305c
|
Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
# mall-admin/src/main/java/com/buy507/mall/service/impl/PmsProductServiceImpl.java
# mall-dao/src/main/java/com/buy507/mall/mapper/PmsProductMapper.java
# mall-dao/src/main/resources/com/buy507/mall/mapper/PmsProductMapper.xml
|
2025-02-26 10:40:51 +08:00 |
|
|
|
6e329f4226
|
Merge pull request 'main-cx' (#15) from main-cx into main
Reviewed-on: #15
|
2025-02-26 10:36:15 +08:00 |
|
|
|
fdec029158
|
会员中心、添加商品
|
2025-02-26 10:36:03 +08:00 |
|
chenxin
|
dab9156c8f
|
Merge remote-tracking branch 'origin/main' into main-cx
|
2025-02-26 10:35:39 +08:00 |
|
chenxin
|
419f7c9886
|
提交最终代码
|
2025-02-26 10:34:54 +08:00 |
|
|
|
153dc8751e
|
修改更新发展基金、个人钱包业务逻辑
|
2025-02-22 15:59:12 +08:00 |
|
|
|
0a2e13c428
|
Merge remote-tracking branch 'origin/main-zhb'
|
2025-02-21 11:27:34 +08:00 |
|
|
|
39553dd80e
|
Merge pull request '修改bug' (#14) from main-cx into main
Reviewed-on: #14
|
2025-02-21 11:26:34 +08:00 |
|
|
|
873360a300
|
我的钱包业务逻辑实现
|
2025-02-21 11:26:10 +08:00 |
|
|
|
d2b590a414
|
修改bug
|
2025-02-21 11:26:10 +08:00 |
|
|
|
46c7576ba9
|
Merge pull request '余额支付和积分支付添加进流水表' (#13) from main-cx into main
Reviewed-on: #13
|
2025-02-21 10:15:10 +08:00 |
|
|
|
ac6ad6533a
|
余额支付和积分支付添加进流水表
|
2025-02-21 10:14:48 +08:00 |
|
|
|
13374f4249
|
Merge pull request 'main-cx' (#12) from main-cx into main
Reviewed-on: #12
|
2025-02-20 17:32:02 +08:00 |
|
|
|
3e6b15eade
|
Merge remote-tracking branch 'origin/main' into main-cx
|
2025-02-20 17:31:21 +08:00 |
|
|
|
6939311e6f
|
完成积分支付和余额支付
|
2025-02-20 17:30:20 +08:00 |
|
|
|
88d7814ad4
|
我的钱包业务逻辑实现
|
2025-02-20 17:26:54 +08:00 |
|
|
|
416f1d4558
|
Merge branch 'main' into main-zhb
# Conflicts:
# mall-admin/pom.xml
# mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java
|
2025-02-20 15:30:11 +08:00 |
|
|
|
24c4d039b4
|
修改bug
|
2025-02-20 15:21:37 +08:00 |
|
|
|
9fa3789b8e
|
Merge pull request '修改bug' (#11) from main-cx into main
Reviewed-on: #11
|
2025-02-20 15:20:03 +08:00 |
|
|
|
c4cb4a5a4a
|
修改bug
|
2025-02-20 15:19:41 +08:00 |
|
|
|
5c5a9cba80
|
Merge pull request 'main-cx' (#10) from main-cx into main
Reviewed-on: #10
|
2025-02-20 15:08:49 +08:00 |
|
|
|
9b6a3a3fdb
|
Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
# mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
|
2025-02-20 11:37:55 +08:00 |
|
|
|
6225d23311
|
现金、积分分润逻辑实现
|
2025-02-20 11:36:04 +08:00 |
|
|
|
10d3387b91
|
Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
# mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
|
2025-02-20 11:32:05 +08:00 |
|
|
|
246785dfd8
|
现金、积分分润逻辑实现
|
2025-02-20 11:31:36 +08:00 |
|
|
|
4dd372831b
|
Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
# mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
|
2025-02-20 11:29:59 +08:00 |
|
|
|
68a2e24223
|
现金、积分分润逻辑实现
|
2025-02-20 11:29:20 +08:00 |
|
|
|
d1c461e02d
|
Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
# mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
|
2025-02-20 11:23:07 +08:00 |
|
|
|
c572ec0f84
|
现金、积分分润逻辑实现
|
2025-02-20 11:18:28 +08:00 |
|
|
|
305497c55f
|
Merge remote-tracking branch 'origin/main' into main-cx
|
2025-02-20 10:43:17 +08:00 |
|
|
|
6ed1e2ebda
|
增加字段
|
2025-02-20 10:42:59 +08:00 |
|
|
|
0b4ce84d7f
|
Merge pull request '会员中心代码提交' (#9) from main-cx into main
Reviewed-on: #9
|
2025-02-19 17:09:45 +08:00 |
|
|
|
72a723a7f1
|
会员中心代码提交
|
2025-02-19 17:09:19 +08:00 |
|
|
|
dddb336586
|
Merge pull request '首页代码完善实现' (#8) from main-cx into main
Reviewed-on: #8
|
2025-02-19 10:59:27 +08:00 |
|
|
|
5f49434239
|
首页代码完善实现
|
2025-02-19 10:58:55 +08:00 |
|
|
|
5bd4ab7d2e
|
Merge pull request '首页逻辑实现' (#7) from main-cx into main
Reviewed-on: #7
|
2025-02-18 17:09:24 +08:00 |
|
|
|
4edd8ea7e5
|
首页逻辑实现
|
2025-02-18 17:09:02 +08:00 |
|
|
|
2b5f4c3c5e
|
Merge remote-tracking branch 'origin/main-zhb'
|
2025-02-18 14:02:32 +08:00 |
|
|
|
5b8eef7bd2
|
发展基金相关实现修改
|
2025-02-18 14:00:39 +08:00 |
|
|
|
edb449a1ec
|
Merge pull request '积分专区的实现' (#6) from main-cx into main
Reviewed-on: #6
|
2025-02-18 13:59:36 +08:00 |
|
|
|
df3f042b2c
|
积分专区的实现
|
2025-02-18 13:58:16 +08:00 |
|
|
|
b594007638
|
Merge remote-tracking branch 'origin/main-zhb'
|
2025-02-18 13:42:51 +08:00 |
|
|
|
dfba7801e2
|
发展基金相关实现修改
|
2025-02-18 13:42:07 +08:00 |
|
|
|
de23604153
|
Merge pull request '发展基金相关实现-增加发展基金' (#5) from main-zhb into main
Reviewed-on: #5
|
2025-02-17 16:00:49 +08:00 |
|
