huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-24 16:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,547 Commits 1 Branch 0 Tags 176 MiB
0c99c16989
Commit Graph

6547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
bf40767fa1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-22 21:56:17 +08:00
YunaiV
7c4fbc63dc trade：物流费用计算，增加金额 divide 分拆逻辑 2023-09-22 21:56:09 +08:00
owen
ee15b802b2 分佣: 推广人排行 2023-09-22 21:12:09 +08:00
owen
972b01c001 分佣: 佣金排行 2023-09-22 20:55:05 +08:00
jason
92f6c8f4d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-22 19:05:20 +08:00
jason
910ffa7a5a 钱包充值退款 2023-09-22 19:04:59 +08:00
owen
7a8a440eb6 分佣: 佣金记录 2023-09-22 18:49:26 +08:00
owen
eddc897cd8 分佣: 提现记录 2023-09-22 18:48:16 +08:00
owen
637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
owen
c146c98b72 分佣: 提现 2023-09-22 18:06:11 +08:00
owen
f72a087007 分佣: 我的推广统计接口 2023-09-22 15:42:59 +08:00
owen
594e4d5fee system: uniapp增加字典数据查询接口 2023-09-22 15:11:06 +08:00
owen
a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
owen
5ed99a9105 trade: 分销业务 - 整理包名 2023-09-22 00:26:32 +08:00
YunaiV
24111c1548 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 22:02:30 +08:00
YunaiV
5949727c8d trade：全局配送价格配置 2023-09-21 22:02:22 +08:00
jason
c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 17:32:43 +08:00
jason
dbd7ab5f23 code review 修改 2023-09-21 17:31:58 +08:00
samisgod
b94f89b4f5 refresh after task add 2023-09-21 15:08:35 +08:00
puhui999
8060aeb5e7 秒杀: app 端返回增加秒杀活动状态 2023-09-21 09:07:37 +08:00
YunaiV
35569c5ec8 trade：下单时，如果是门店自提，增加核销码的生成 2023-09-20 23:21:00 +08:00
YunaiV
1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
puhui999
583a0a2dd5 砍价+拼团: 修复 selectList limit 条件执行报错问题 2023-09-20 16:28:41 +08:00
puhui999
6ef94ade6a 完善订单和活动 review 提到的问题 2023-09-20 16:06:29 +08:00
puhui999
52848d6341 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
 2023-09-20 10:14:43 +08:00
puhui999
1d2a6ad065 拼团活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-20 10:09:15 +08:00
YunaiV
c766f7daa5 code review：砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
YunaiV
1b154699c6 code review：处理错误的 mysql 连接 2023-09-20 00:10:18 +08:00
YunaiV
2278ad4652 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-20 00:03:18 +08:00
YunaiV
962f2bbf69 code review：提现逻辑 2023-09-19 23:58:16 +08:00
YunaiV
9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	README.md
 2023-09-19 22:28:45 +08:00
芋道源码
de7699d972
!624 trade: 分销业务 - 佣金提现 
Merge pull request !624 from 疯狂的世界/brokerate
 2023-09-19 14:25:43 +00:00
owen
e22c577f7a trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:20:32 +08:00
YunaiV
8cfb738db3 code review：分销逻辑 2023-09-19 22:16:25 +08:00
owen
32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
芋道源码
581f9d4101
!622 trade: 分销业务review代码修改 
Merge pull request !622 from 疯狂的世界/brokerate
 2023-09-19 13:48:07 +00:00
芋道源码
edfa7bcefb
update README.md. 
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
 2023-09-19 11:34:35 +00:00
puhui999
04a391cd4b Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationActivityApiImpl.java
 2023-09-19 18:58:53 +08:00
puhui999
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
owen
f998d43e68 infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题 2023-09-19 17:14:42 +08:00
owen
a3e161a9a3 trade: 分销业务review代码修改 2023-09-19 16:50:43 +08:00
xingyu
6c80ef38f5 docs: spring boot3 2023-09-19 16:37:54 +08:00
owen
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
puhui999
af6016bba5 砍价活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 16:35:21 +08:00
owen
75874035a4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-19 15:31:14 +08:00
YunaiV
be1ecf96d4 code review：会员签到逻辑 2023-09-18 22:18:42 +08:00
YunaiV
477342d324 Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product 2023-09-18 13:49:07 +08:00
YunaiV
080c32b9f3 code review：钱包充值 2023-09-18 13:07:54 +08:00
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题，减少包依赖大小 2023-09-17 01:37:10 +08:00
YunaiV
436fef7efa 1. 移除 netty-all，减少依赖 
2. 修复 xss 无法禁用的问题
 2023-09-17 00:37:11 +08:00