YunaiV
|
1b9a3f9f63
|
code review：调整操作日志的封装
|
3 years ago |
jason
|
bcb3b19418
|
钱包充值 表结构设计
|
3 years ago |
puhui999
|
a10d77cdfe
|
mall+order: 完善部分 TODO 提到的问题
|
3 years ago |
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
3 years ago |
|
YunaiV
|
9358639c41
|
code review：订单部分逻辑
|
3 years ago |
|
YunaiV
|
e8bdd8349c
|
code review：订单部分逻辑
|
3 years ago |
Shimada666
|
a2ba5518e0
|
fix: 使初始化数据脚本兼容 mysql5.7
官方文档中，推荐使用 mysql5.7
"项目使用 MySQL 存储数据，所以需要启动一个 MySQL 服务，建议使用 5.7 版本。"
但实际上，现在的初始化数据脚本中包含 mysql8.0 才引入的排序规则，与 5.7 不兼容。
故修改排序规则，将 utf8mb4_0900_ai_ci 均改为 utf8mb4_unicode_ci，以支持 mysql5.7
|
3 years ago |
|
YunaiV
|
bdd81e4cbc
|
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
|
3 years ago |
|
YunaiV
|
82c6354e1d
|
code review：分销逻辑
|
3 years ago |
|
芋道源码
|
18c9f22560
|
!616 完善分销功能
Merge pull request !616 from 疯狂的世界/brokerate
|
3 years ago |
owen
|
c67ecbf61d
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
3 years ago |
|
puhui999
|
950ec10cff
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
254d7828aa
|
mall+order: 订单活动特殊逻辑的抽离
|
3 years ago |
|
YunaiV
|
1f327ef8ca
|
更新商城的演示地址
|
3 years ago |
|
YunaiV
|
f2ee213caa
|
更新商城的演示地址
|
3 years ago |
|
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
|
3 years ago |
|
xingyu
|
4674caa01a
|
fix: vben codegen
|
3 years ago |
|
xingyu
|
092e48b9d5
|
perf: vben codegen
|
3 years ago |
|
xingyu
|
5e9e41c045
|
fix: required 过期
|
3 years ago |
|
xingyu
|
1184b46c40
|
chore: up justauth 1.0.4
|
3 years ago |
|
xingyu
|
97a91e5454
|
chore: up hutool 5.8.21
|
3 years ago |
|
xingyu
|
c5b78a2af5
|
chore: up druid 1.2.19
|
3 years ago |
|
xingyu
|
e1b92c3d64
|
chore: up springboot 2.7.15
|
3 years ago |
|
YunaiV
|
314dee430e
|
bugfix：微信公众号登录报 access token 的问题
|
3 years ago |
|
owen
|
77daa0085e
|
trade: 分销业务review代码修改
|
3 years ago |
|
puhui999
|
7fb455096c
|
商城活动: 完善活动商品并发库存扣减逻辑
|
3 years ago |
|
owen
|
cddeb37289
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
|
3 years ago |
|
owen
|
4eedf6ad36
|
Merge remote-tracking branch 'owen/brokerate' into brokerate
|
3 years ago |
|
owen
|
290d1671a2
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
owen
|
0c9485a6bf
|
infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题
|
3 years ago |
|
owen
|
dffdd471d5
|
member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题
|
3 years ago |
|
owen
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
puhui999
|
3976011af0
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
499a054eb9
|
trade: 分销业务后台功能：推广用户列表
|
3 years ago |
|
YunaiV
|
40e1a879e3
|
登录：社交登录时，额外返回 openid
|
3 years ago |
|
puhui999
|
57f0ea04f7
|
mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）
|
3 years ago |
|
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
3 years ago |
|
puhui999
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
3 years ago |
|
puhui999
|
50354462fe
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
puhui999
|
95d8be0455
|
订单管理：完善订单聚合搜索
|
3 years ago |
|
YunaiV
|
2bbd86e25d
|
优化 README 说明
|
3 years ago |
|
YunaiV
|
4265441e1d
|
分销：增加商品的分佣金额计算 api mock
|
3 years ago |
|
YunaiV
|
a47d744f64
|
分销：绑定分销的 url 调整
|
3 years ago |
|
owen
|
797680895b
|
trade: 分销业务后台功能：佣金格式化
|
3 years ago |
|
YunaiV
|
cd51d57f12
|
分销：调整 app 的 price 到 brokeragePrice
|
3 years ago |
|
YunaiV
|
426594ae00
|
分销：调整 app 的 price 到 brokeragePrice
|
3 years ago |
|
owen
|
643602d038
|
trade: 分销业务后台功能：修改上级推广人
|
3 years ago |
|
jason
|
5858f57fe9
|
钱包 review 修改
|
3 years ago |
|
YunaiV
|
5a940b1d2c
|
修复 knife4j get 参数无法正确展示的问题
|
3 years ago |
|
YunaiV
|
a5e33f6d3a
|
引入 mybatis plus join 作为基类
|
3 years ago |