YunaiV
|
60875a0472
|
code review：获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持
|
2 years ago |
|
YunaiV
|
175d244dee
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
5932e8e931
|
code review：订单列表、详情
|
2 years ago |
|
芋道源码
|
287a17a9ff
|
!583 调整 获取用户积分记录 和 获取用户签到记录接口 配合前端用户详情页面
Merge pull request !583 from 风狗/会员详情
|
2 years ago |
jason
|
c0ffaf8ea9
|
支付宝 PC 网站 Client 单元测试
|
2 years ago |
|
jason
|
c7f0b5c73d
|
支付宝 H5 Client 单元测试
|
2 years ago |
|
芋道源码
|
4c634245e9
|
!581 订单列表管理重构完善
Merge pull request !581 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
54bf24b966
|
code review：会员等级
|
2 years ago |
puhui999
|
002475f33a
|
订单管理：完善订单管理 补全相关接口
|
2 years ago |
|
puhui999
|
d2c135eda9
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2 years ago |
绮梦
|
0753df68b8
|
feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。
|
2 years ago |
|
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
|
2 years ago |
|
芋道源码
|
883bdc65a1
|
!580 会员: 增加会员分组功能
Merge pull request !580 from 疯狂的世界/member_dev
|
2 years ago |
|
YunaiV
|
292f23c4b2
|
code review：会员等级
|
2 years ago |
|
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2 years ago |
|
jason
|
eff9fafde8
|
创建支付宝 Client 抽象类测试类, 测试公共方法
|
2 years ago |
owen
|
5a2d9d14df
|
会员: 删除用户标签, 用户等级时, 校验是否关联了用户
|
2 years ago |
|
owen
|
7fd497fcc9
|
会员: 修改重复的错误码
|
2 years ago |
|
owen
|
7b2f639324
|
会员: 规范代码, 用户等级, 用户分组
|
2 years ago |
|
puhui999
|
716f11e80b
|
fix: 合并差异
|
2 years ago |
|
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
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
8ae3401452
|
会员: 增加会员分组功能
|
2 years ago |
|
puhui999
|
c2b6c0d72a
|
fix: 订单列表重构 ①
|
2 years ago |
|
YunaiV
|
800c44a46e
|
code review：会员等级
|
2 years ago |
|
芋道源码
|
4cd5b5712b
|
!577 会员：修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
|
2 years ago |
|
YunaiV
|
0d1fc1138a
|
增加 app 的签到 mock 接口、积分记录分页、签到记录分页
|
2 years ago |
|
owen
|
de83531285
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
2 years ago |
|
owen
|
e711092440
|
会员：用户管理增加用户等级查询条件
|
2 years ago |
|
owen
|
8ffbc15cec
|
会员：后台调整会员等级
|
2 years ago |
|
owen
|
f884054d2c
|
会员：完善会员等级校验、单元测试
|
2 years ago |
|
芋道源码
|
8f9404f99b
|
!579 同步商城实现：会员列表、会员积分、会员签到、会员标签
Merge pull request !579 from 芋道源码/feature/mall_product
|
2 years ago |
|
YunaiV
|
c3e4e23459
|
同步最新 Member 菜单
|
2 years ago |
|
芋道源码
|
3124948175
|
!578 同步商城实现：会员列表、会员积分、会员签到、会员标签
Merge pull request !578 from 芋道源码/feature/mall_product
|
2 years ago |
|
YunaiV
|
281ba1e369
|
code review：调整错误码分段
|
2 years ago |
|
YunaiV
|
a83c156bf1
|
code review：签到记录
|
2 years ago |
|
YunaiV
|
c5e85f3bfb
|
code review：签到配置
|
2 years ago |
|
YunaiV
|
4257cad46a
|
code review：会员积分
|
2 years ago |
|
owen
|
e2032e7e97
|
会员：增加会员等级增删改查
|
2 years ago |
|
owen
|
9eca965dd6
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
|
2 years ago |
|
YunaiV
|
c7285da9a7
|
code review：会员签到配置
|
2 years ago |
|
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
|
2 years ago |
|
芋道源码
|
fe53e426a4
|
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
Merge pull request !573 from Carry/master
|
2 years ago |
|
owen
|
fe68b42a8c
|
会员：修改会员标签名称唯一校验逻辑
|
2 years ago |
|
芋道源码
|
29ae1bcbca
|
!575 会员积分和会员签到模块todo修改
Merge pull request !575 from QingX/feature/mall_product
|
2 years ago |
|
YunaiV
|
2584911d88
|
code review：会员标签
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
95254341a1
|
1. 会员用户的找回密码 API 的优化
|
3 years ago |
|
owen
|
4f589cad53
|
会员：
1.会员设置标签
|
3 years ago |
|
YunaiV
|
5d4a7ffa3b
|
1. 会员用户的修改密码 API 的优化
|
3 years ago |