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 |
|
owen
|
ca55e61dd2
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
3 years ago |
|
YunaiV
|
65d7b30011
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
YunaiV
|
55f8585ea8
|
同步
|
3 years ago |
|
芋道源码
|
fcf8ec98a0
|
!608 Date转localDateTime
Merge pull request !608 from GamePlayer-Joker/master
|
3 years ago |
|
芋道源码
|
5719b7df06
|
!612 使用下划线分隔ErrorCodeConstants的ErrorCode
Merge pull request !612 from dhb52/master
|
3 years ago |
|
芋道源码
|
5d4a750dfb
|
!609 ID列存在换行符造成SQL Server建库时列名异常，并造成后续相关命令执行失败
Merge pull request !609 from samisgod/master
|
3 years ago |
|
YunaiV
|
7bf21fb02d
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
3 years ago |
|
芋道源码
|
57d2b7e3be
|
Merge pull request #342 from Lemon-cc-hang/social
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
3 years ago |
|
YunaiV
|
557b09a157
|
code review：分销逻辑
|
3 years ago |
|
芋道源码
|
3b5215db21
|
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
|
3 years ago |
|
owen
|
4e9be7a181
|
trade: 分销业务后台功能：修改推广资格
|
3 years ago |
|
owen
|
259734964d
|
trade: 分销业务后台功能：清除推广员、修改推广员
|
3 years ago |
|
owen
|
f97c7a0f6e
|
trade: 分销业务绑定推广员
|
3 years ago |