YunaiV
|
8b50cd9661
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
40e1a879e3
|
登录：社交登录时，额外返回 openid
|
2 years ago |
|
YunaiV
|
65d7b30011
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
557b09a157
|
code review：分销逻辑
|
2 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2 years ago |
owen
|
6ef36d5ca6
|
trade: 增加分销 API
|
2 years ago |
lemoncc
|
2fd201c7fa
|
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
2 years ago |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
2 years ago |
|
owen
|
166b1b31c0
|
trade: 分销用户管理
|
2 years ago |
|
YunaiV
|
5808f77ade
|
code review：订单分佣
|
2 years ago |
|
YunaiV
|
b8a4d8cab2
|
分销：避免报错
|
2 years ago |
|
YunaiV
|
eb342d5abf
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2 years ago |
|
芋道源码
|
ea26691967
|
!607 member: 佣金解冻
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
|
2 years ago |
|
YunaiV
|
bf92727b27
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2 years ago |
|
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
2 years ago |
|
owen
|
9336a0a102
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2 years ago |
|
YunaiV
|
0329f13fbf
|
分佣：增加获得分销排行分页 API mock
|
2 years ago |
|
owen
|
9eb7837b67
|
member: 佣金失效
|
2 years ago |
|
owen
|
a708521b9d
|
member: 佣金解冻
|
2 years ago |
|
owen
|
2f6092005b
|
member: 佣金解冻
|
2 years ago |
|
芋道源码
|
a58d7d63ed
|
!606 会员：分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
|
2 years ago |
|
owen
|
090058a2ba
|
member: 佣金不冻结时，直接就是结算状态
|
2 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2 years ago |
|
YunaiV
|
eae8218f0d
|
分佣：增加获得分销排行分页 API mock
|
2 years ago |
|
YunaiV
|
7389e4fb65
|
分佣：增加获得分销记录分页 API mock
|
2 years ago |
|
YunaiV
|
fc56a15f76
|
分佣：增加用户分销记录、提现 API mock
|
2 years ago |
|
YunaiV
|
6a819da0b6
|
分佣：增加用户分销统计 API mock
|
2 years ago |
|
owen
|
991b53649b
|
member: 分销配置
|
2 years ago |
|
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2 years ago |
|
YunaiV
|
9148170926
|
调整 mapper 命名，避免可能的冲突
|
2 years ago |
|
YunaiV
|
e6f1e5d968
|
同步最新商城演示图
|
2 years ago |
|
YunaiV
|
5a788af084
|
购物车：简化 cart 表命名
|
2 years ago |
|
YunaiV
|
ddcb3e69f9
|
会员等级 app 接口
|
2 years ago |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
2 years ago |
|
芋道源码
|
806228be8b
|
!593 商品评论表增加冗余 SKU 的图片地址, 规格
Merge pull request !593 from 疯狂的世界/owen_dev
|
2 years ago |
|
YunaiV
|
99dd33c408
|
code review：会员中心的详情返回 totalPoint 积分
|
2 years ago |
|
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
2 years ago |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
2 years ago |
绮梦
|
f10b638caf
|
feat: 获得会员用户接口增加经验值字段
|
2 years ago |
|
YunaiV
|
f6f33a07d0
|
code review：订单评论、订单积分的变更
|
2 years ago |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
2 years ago |
|
芋道源码
|
f8952f8e34
|
!591 商品：完善商品评论功能
Merge pull request !591 from 疯狂的世界/owen_dev
|
2 years ago |
|
YunaiV
|
583d34a801
|
code review：移除收件地址多余的方法
|
2 years ago |
|
YunaiV
|
1b192b5032
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
61d51e54dc
|
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/convert/user/MemberUserConvert.java
|
2 years ago |
|
owen
|
fd126ba2f7
|
member: 根据积分配置的比例，换算积分
|
2 years ago |
|
owen
|
d4acacec60
|
trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分
|
2 years ago |
|
owen
|
9aee08ee0e
|
会员：修改Review的代码
|
2 years ago |
|
绮梦
|
65eddc63af
|
feat: 增加管理后台用户收件地址管理接口。
|
2 years ago |
|
YunaiV
|
9b6f5bd503
|
code review：会员等级
|
2 years ago |