huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-05 05:31:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,133 Commits 1 Branch 0 Tags 176 MiB
057952bdeb
Commit Graph

5133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
54bf24b966 code review：会员等级 2023-08-22 21:59:00 +08:00
owen
b7f54a3061 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
 2023-08-22 21:26:10 +08:00
owen
ca51056c00 会员: 统一用户等级记录、用户经验记录 命名 2023-08-22 20:49:25 +08:00
puhui999
002475f33a 订单管理：完善订单管理 补全相关接口 2023-08-22 18:55:00 +08:00
puhui999
d2c135eda9 订单管理：添加修改备注、订单调价、修改地址接口 2023-08-22 16:31:28 +08:00
绮梦
0753df68b8 feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。 2023-08-22 15:31:36 +08:00
YunaiV
551a968449 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
 2023-08-22 12:57:15 +08:00
芋道源码
883bdc65a1
!580 会员: 增加会员分组功能 
Merge pull request !580 from 疯狂的世界/member_dev
 2023-08-22 04:55:40 +00:00
YunaiV
292f23c4b2 code review：会员等级 2023-08-22 12:53:29 +08:00
puhui999
d29c5a556c 订单管理：添加修改备注、订单调价、修改地址接口 2023-08-22 12:19:25 +08:00
owen
bdb38c4157 会员: 修改会员等级，使用单独的表单、接口 2023-08-22 11:23:09 +08:00
jason
eff9fafde8 创建支付宝 Client 抽象类测试类, 测试公共方法 2023-08-22 08:40:41 +08:00
owen
5a2d9d14df 会员: 删除用户标签, 用户等级时, 校验是否关联了用户 2023-08-22 01:33:28 +08:00
owen
7fd497fcc9 会员: 修改重复的错误码 2023-08-22 01:22:01 +08:00
owen
7b2f639324 会员: 规范代码, 用户等级, 用户分组 2023-08-22 01:15:16 +08:00
puhui999
716f11e80b fix: 合并差异 2023-08-22 00:57:36 +08:00
owen
9d9638b15b Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
 2023-08-22 00:47:45 +08:00
puhui999
8123354f09 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
 2023-08-22 00:46:47 +08:00
owen
8ae3401452 会员: 增加会员分组功能 2023-08-22 00:43:36 +08:00
puhui999
c2b6c0d72a fix: 订单列表重构 ① 2023-08-22 00:42:20 +08:00
YunaiV
800c44a46e code review：会员等级 2023-08-21 23:18:04 +08:00
芋道源码
4cd5b5712b
!577 会员：修改会员标签名称唯一校验逻辑 
Merge pull request !577 from 疯狂的世界/member_dev
 2023-08-21 14:51:19 +00:00
YunaiV
0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2023-08-21 22:20:59 +08:00
owen
de83531285 会员：用户标签增加下拉框使用的 精简信息列表查询接口 2023-08-21 21:44:04 +08:00
owen
e711092440 会员：用户管理增加用户等级查询条件 2023-08-21 21:42:59 +08:00
owen
8ffbc15cec 会员：后台调整会员等级 2023-08-21 21:31:16 +08:00
owen
f884054d2c 会员：完善会员等级校验、单元测试 2023-08-21 00:23:45 +08:00
芋道源码
8f9404f99b
!579 同步商城实现：会员列表、会员积分、会员签到、会员标签 
Merge pull request !579 from 芋道源码/feature/mall_product
 2023-08-20 12:01:43 +00:00
YunaiV
c3e4e23459 同步最新 Member 菜单 2023-08-20 20:01:18 +08:00
芋道源码
3124948175
!578 同步商城实现：会员列表、会员积分、会员签到、会员标签 
Merge pull request !578 from 芋道源码/feature/mall_product
 2023-08-20 11:50:58 +00:00
YunaiV
281ba1e369 code review：调整错误码分段 2023-08-20 19:38:17 +08:00
YunaiV
a83c156bf1 code review：签到记录 2023-08-20 19:34:28 +08:00
YunaiV
c5e85f3bfb code review：签到配置 2023-08-20 19:26:31 +08:00
YunaiV
4257cad46a code review：会员积分 2023-08-20 19:06:23 +08:00
owen
e2032e7e97 会员：增加会员等级增删改查 2023-08-20 15:54:06 +08:00
owen
9eca965dd6 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 2023-08-20 10:55:42 +08:00
YunaiV
c7285da9a7 code review：会员签到配置 2023-08-20 10:14:28 +08:00
YunaiV
bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
 2023-08-20 09:45:34 +08:00
芋道源码
fe53e426a4
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 
Merge pull request !573 from Carry/master
 2023-08-20 01:44:35 +00:00
owen
fe68b42a8c 会员：修改会员标签名称唯一校验逻辑 2023-08-20 09:41:15 +08:00
芋道源码
29ae1bcbca
!575 会员积分和会员签到模块todo修改 
Merge pull request !575 from QingX/feature/mall_product
 2023-08-20 01:36:32 +00:00
YunaiV
2584911d88 code review：会员标签 2023-08-20 09:25:23 +08:00
YunaiV
8191d9e141 Merge branch 'member_dev' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
 2023-08-20 09:02:16 +08:00
YunaiV
95254341a1 1. 会员用户的找回密码 API 的优化 2023-08-19 23:12:34 +08:00
owen
4f589cad53 会员： 
1.会员设置标签
 2023-08-19 20:19:56 +08:00
YunaiV
5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 2023-08-19 20:16:41 +08:00
YunaiV
87e5b2bed1 1. 会员用户的修改手机 API 的优化 2023-08-19 19:23:54 +08:00
YunaiV
4153331535 1. 合并 member 修改昵称和头像接口，统一成修改基本信息 API 2023-08-19 17:47:34 +08:00
YunaiV
94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 2023-08-19 17:00:40 +08:00
owen
9b6e2114c7 会员： 
1.增加会员标签功能
 2023-08-19 16:06:12 +08:00