owen
|
e9fd377772
|
分销：Review代码修改
|
3 years ago |
|
owen
|
f7296d18b9
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
|
3 years ago |
YunaiV
|
53e789dfdc
|
trade：订单表，增加 vip 优惠字段
|
3 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
3 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
3 years ago |
|
YunaiV
|
be1ecf96d4
|
code review：会员签到逻辑
|
3 years ago |
xiaqing
|
d4a891e6c4
|
新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
|
3 years ago |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
3 years ago |
|
YunaiV
|
5808f77ade
|
code review：订单分佣
|
3 years ago |
|
owen
|
9336a0a102
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
2f6092005b
|
member: 佣金解冻
|
3 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
3 years ago |
|
owen
|
991b53649b
|
member: 分销配置
|
3 years ago |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
3 years ago |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
3 years ago |
|
owen
|
d4acacec60
|
trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分
|
3 years ago |
|
owen
|
9aee08ee0e
|
会员：修改Review的代码
|
3 years ago |
|
YunaiV
|
9b6f5bd503
|
code review：会员等级
|
3 years ago |
|
owen
|
dc382d80bb
|
会员: 重构会员等级逻辑
|
3 years ago |
|
owen
|
bdb38c4157
|
会员: 修改会员等级，使用单独的表单、接口
|
3 years ago |
|
owen
|
7fd497fcc9
|
会员: 修改重复的错误码
|
3 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
|
3 years ago |
|
owen
|
8ae3401452
|
会员: 增加会员分组功能
|
3 years ago |
|
芋道源码
|
4cd5b5712b
|
!577 会员：修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
|
3 years ago |
|
owen
|
8ffbc15cec
|
会员：后台调整会员等级
|
3 years ago |
|
owen
|
f884054d2c
|
会员：完善会员等级校验、单元测试
|
3 years ago |
|
YunaiV
|
281ba1e369
|
code review：调整错误码分段
|
3 years ago |
|
YunaiV
|
a83c156bf1
|
code review：签到记录
|
3 years ago |
|
YunaiV
|
4257cad46a
|
code review：会员积分
|
3 years ago |
|
owen
|
e2032e7e97
|
会员：增加会员等级增删改查
|
3 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
|
3 years ago |
|
YunaiV
|
95254341a1
|
1. 会员用户的找回密码 API 的优化
|
3 years ago |
|
YunaiV
|
87e5b2bed1
|
1. 会员用户的修改手机 API 的优化
|
3 years ago |
|
owen
|
9b6e2114c7
|
会员：
1.增加会员标签功能
|
3 years ago |
|
YunaiV
|
be2ee905df
|
code review：积分模块的实现
|
3 years ago |
|
YunaiV
|
040a66965c
|
mall + member：
1、review 积分
|
3 years ago |
|
芋道源码
|
2f42964a96
|
!524 会员中心合并至member 模块
Merge pull request !524 from QingX/feature/mall_product
|
3 years ago |
|
YunaiV
|
3750dc76c7
|
mall + trade：
1、获取订单结算信息，增加积分的 mock 返回
|
3 years ago |
|
xiaqing
|
c7ced55a6c
|
会员中心代码、sql脚本提交
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
3 years ago |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
3 years ago |
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
3 years ago |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
YunaiV
|
01d10b518c
|
trade：优化创建订单接口的后端实现
|
3 years ago |
|
YunaiV
|
a89d5a83db
|
promotion：增加优惠劵的后端分页接口
|
3 years ago |
|
YunaiV
|
4ce76e82fc
|
mall：完善收件地址
|
4 years ago |
|
YunaiV
|
e1c08c4661
|
新增 member/auth/weixin-mini-app-login 接口，实现小程序的手机登录
|
4 years ago |
|
YunaiV
|
bb26bc4012
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
yudao-ui-admin/src/components/ImageUpload/index.vue
|
4 years ago |
git
|
1fc5c3c71c
|
用户个人信息查询
|
4 years ago |
|
YunaiV
|
5e8648508e
|
去除 Spring Security 的 Member 的 loadUsername，使用自己定义的 login0 实现
|
4 years ago |