|
|
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 |
|
|
|
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 |
|
|
|
873360a300
|
我的钱包业务逻辑实现
|
2025-02-21 11:26:10 +08:00 |
|
|
|
d2b590a414
|
修改bug
|
2025-02-21 11:26:10 +08:00 |
|
|
|
ac6ad6533a
|
余额支付和积分支付添加进流水表
|
2025-02-21 10:14:48 +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 |
|
|
|
c4cb4a5a4a
|
修改bug
|
2025-02-20 15:19:41 +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 |
|
|
|
246785dfd8
|
现金、积分分润逻辑实现
|
2025-02-20 11:31:36 +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 |
|
|
|
72a723a7f1
|
会员中心代码提交
|
2025-02-19 17:09:19 +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 |
|
|
|
df3f042b2c
|
积分专区的实现
|
2025-02-18 13:58:16 +08:00 |
|
|
|
dfba7801e2
|
发展基金相关实现修改
|
2025-02-18 13:42:07 +08:00 |
|
|
|
c18db6ffd3
|
发展基金相关实现-增加发展基金
|
2025-02-17 15:57:20 +08:00 |
|
|
|
2a009e9037
|
发展基金相关实现-查询发展基金
|
2025-02-17 14:28:22 +08:00 |
|
|
|
6da09d93fd
|
积分专区的实现
|
2025-02-17 14:15:26 +08:00 |
|
|
|
d781eaa358
|
修改会员专区和积分专区的逻辑
|
2025-02-17 10:13:22 +08:00 |
|
|
|
48f6dd405b
|
增加会员专区 积分专区 积分兑换内容 增加三个专区的字段
|
2025-02-14 15:47:15 +08:00 |
|
mcbird2009@qq.com
|
68005e6961
|
慧麦商城
|
2024-12-13 15:21:20 +08:00 |
|
