huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 15:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,368 Commits 1 Branch 0 Tags 176 MiB
15313c2992
Commit Graph

5368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
 2023-09-12 12:22:55 +08:00
YunaiV
82c6354e1d code review：分销逻辑 2023-09-12 09:20:42 +08:00
芋道源码
18c9f22560
!616 完善分销功能 
Merge pull request !616 from 疯狂的世界/brokerate
 2023-09-11 14:20:02 +00:00
owen
c67ecbf61d Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-11 20:04:23 +08:00
puhui999
950ec10cff Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-11 17:51:17 +08:00
puhui999
254d7828aa mall+order: 订单活动特殊逻辑的抽离 2023-09-11 17:48:01 +08:00
YunaiV
1f327ef8ca 更新商城的演示地址 2023-09-11 16:55:56 +08:00
YunaiV
f2ee213caa 更新商城的演示地址 2023-09-11 16:42:38 +08:00
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
 2023-09-11 16:19:55 +08:00
xingyu
4674caa01a fix: vben codegen 2023-09-11 13:35:00 +08:00
xingyu
092e48b9d5 perf: vben codegen 2023-09-11 12:41:48 +08:00
xingyu
5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +08:00
xingyu
1184b46c40 chore: up justauth 1.0.4 2023-09-11 12:21:46 +08:00
xingyu
97a91e5454 chore: up hutool 5.8.21 2023-09-11 11:29:14 +08:00
xingyu
c5b78a2af5 chore: up druid 1.2.19 2023-09-11 11:25:12 +08:00
xingyu
e1b92c3d64 chore: up springboot 2.7.15 2023-09-11 11:22:20 +08:00
YunaiV
314dee430e bugfix：微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
owen
77daa0085e trade: 分销业务review代码修改 2023-09-11 00:54:12 +08:00
puhui999
7fb455096c 商城活动: 完善活动商品并发库存扣减逻辑 2023-09-11 00:13:45 +08:00
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
 2023-09-10 23:56:00 +08:00
owen
4eedf6ad36 Merge remote-tracking branch 'owen/brokerate' into brokerate 2023-09-10 23:36:46 +08:00
owen
290d1671a2 trade: 分销业务后台功能：推广订单列表 2023-09-10 23:36:38 +08:00
owen
0c9485a6bf infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题 2023-09-10 23:36:23 +08:00
owen
dffdd471d5 member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题 2023-09-10 23:32:40 +08:00
owen
6c193f723f trade: 分销业务后台功能：推广订单列表 2023-09-10 23:30:43 +08:00
puhui999
3976011af0 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-10 22:54:01 +08:00
owen
499a054eb9 trade: 分销业务后台功能：推广用户列表 2023-09-10 22:32:39 +08:00
YunaiV
40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
puhui999
57f0ea04f7 mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现） 2023-09-10 11:06:39 +08:00
puhui999
c023209aa5 订单管理：完善订单调价分摊逻辑 2023-09-10 00:50:13 +08:00
puhui999
51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2023-09-10 00:48:30 +08:00
puhui999
50354462fe spu：分佣属性和分佣保持一致 2023-09-09 23:18:09 +08:00
puhui999
95d8be0455 订单管理：完善订单聚合搜索 2023-09-09 23:04:13 +08:00
YunaiV
2bbd86e25d 优化 README 说明 2023-09-09 22:53:26 +08:00
YunaiV
4265441e1d 分销：增加商品的分佣金额计算 api mock 2023-09-09 22:28:01 +08:00
YunaiV
a47d744f64 分销：绑定分销的 url 调整 2023-09-09 21:05:44 +08:00
owen
797680895b trade: 分销业务后台功能：佣金格式化 2023-09-09 20:00:57 +08:00
YunaiV
cd51d57f12 分销：调整 app 的 price 到 brokeragePrice 2023-09-09 19:42:53 +08:00
YunaiV
426594ae00 分销：调整 app 的 price 到 brokeragePrice 2023-09-09 19:34:50 +08:00
owen
643602d038 trade: 分销业务后台功能：修改上级推广人 2023-09-09 19:20:12 +08:00
jason
5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
YunaiV
5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2023-09-09 15:04:22 +08:00
YunaiV
a5e33f6d3a 引入 mybatis plus join 作为基类 2023-09-09 14:56:30 +08:00
owen
ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
YunaiV
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
YunaiV
55f8585ea8 同步 2023-09-09 10:34:58 +08:00
芋道源码
fcf8ec98a0
!608 Date转localDateTime 
Merge pull request !608 from GamePlayer-Joker/master
 2023-09-09 02:22:13 +00:00
芋道源码
5719b7df06
!612 使用下划线分隔ErrorCodeConstants的ErrorCode 
Merge pull request !612 from dhb52/master
 2023-09-09 02:20:55 +00:00
芋道源码
5d4a750dfb
!609 ID列存在换行符造成SQL Server建库时列名异常，并造成后续相关命令执行失败 
Merge pull request !609 from samisgod/master
 2023-09-09 02:20:03 +00:00
YunaiV
7bf21fb02d Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-09-09 10:14:11 +08:00