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

5431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jason
4f7c7f5619 wallet - 管理端 钱包余额流水查询 2023-10-16 08:36:28 +08:00
puhui999
0d45acaf20 营销活动：完善文章相关 app 端接口 2023-10-15 22:41:18 +08:00
芋道源码
7bc3b7b2ff
!666 营销活动：新增文章管理，文章分类管理 
Merge pull request !666 from puhui999/feature/mall_product
 2023-10-15 14:05:35 +00:00
jason
7cb8f8fab9 wallet - 管理端 钱包余额查询 2023-10-15 17:33:55 +08:00
puhui999
b009f0b058 application-local.yaml 恢复 2023-10-15 16:43:04 +08:00
puhui999
26d3672668 营销活动: 文章分类管理软件包调整 2023-10-15 16:40:27 +08:00
puhui999
1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-15 16:17:14 +08:00
puhui999
55eed1377a 营销活动: 新增文章管理 2023-10-15 16:16:41 +08:00
daiwencheng
944e3862a5 修复敏感词检验问题 
1.修复排序，优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
 2023-10-15 14:30:43 +08:00
puhui999
a47ab32800 营销活动: 新增文章分类管理 2023-10-15 01:29:30 +08:00
YunaiV
6e4a9c3b01 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-14 22:00:52 +08:00
YunaiV
ca5e3f7bd1 优化最新的商城的 sql 2023-10-14 22:00:30 +08:00
芋道源码
8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。 
Merge pull request !636 from 风狗/feature/mall_product
 2023-10-14 09:53:41 +00:00
芋道源码
82fd800ad2
!641 操作日志搜索参数名修改 
Merge pull request !641 from ligitee/N/A
 2023-10-14 09:52:11 +00:00
芋道源码
fa600dbb44
!662 【工作流】添加vue2版本的退回和委派前端代码 
Merge pull request !662 from LiuMoffett/moffett
 2023-10-14 09:51:00 +00:00
YunaiV
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
YunaiV
970e524088 code review：交易统计 2023-10-14 13:15:14 +08:00
YunaiV
1ac2f2b5c2 code review：会员统计 2023-10-14 01:26:06 +08:00
YunaiV
0eb86ca269 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
 2023-10-13 20:41:17 +08:00
YunaiV
82545ddaac 优化 README.md，减少静态资源加载 2023-10-13 18:27:30 +08:00
puhui999
a4613f0af9 拼团活动: 完善 review 提到的问题 2023-10-13 12:07:28 +08:00
jason
e06f61ef39 wallet - 充值套餐 管理端 2023-10-13 10:46:10 +08:00
jason
8cd7941fc3 wallet - 充值套餐 管理端 2023-10-13 10:43:04 +08:00
YunaiV
04d491b90d 优化 README.md，减少静态资源加载 2023-10-13 09:39:40 +08:00
YunaiV
625504333b 优化 README.md 2023-10-13 09:35:23 +08:00
YunaiV
3105d86b7d 优化 README.md 2023-10-13 09:34:33 +08:00
jason
2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-12 22:21:17 +08:00
jason
571961b4da 充值套餐修改 2023-10-12 22:20:42 +08:00
YunaiV
7a9dbfe41d Merge remote-tracking branch 'origin/master' 2023-10-12 21:59:04 +08:00
YunaiV
b30754a0a4 同步最新 mall 代码 2023-10-12 21:58:56 +08:00
YunaiV
a72869b97e code review：修复部分统计报错 2023-10-12 21:54:06 +08:00
liuxiaolu
9a876cff3d feat:【工作流】添加vue2版本的退回和委派前端代码 2023-10-11 16:08:39 +08:00
owen
4be709b815 统计：Review修改 2023-10-11 15:26:17 +08:00
owen
66cdf4ca4c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-11 15:06:09 +08:00
YunaiV
fef808d88c code review：统计代码 2023-10-11 12:32:28 +08:00
YunaiV
704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-11 11:30:03 +08:00
YunaiV
670a098aa8 code review：拼团记录流程 2023-10-11 11:04:22 +08:00
owen
8d40f1d71a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-11 08:27:57 +08:00
芋道源码
708af92a0f
!660 优化订单 OrderHandler 实现 
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
 2023-10-10 23:51:10 +00:00
YunaiV
b0179457ce 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑） 2023-10-11 07:49:23 +08:00
YunaiV
41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
 2023-10-10 20:42:33 +08:00
芋道源码
7181ccbcef
!657 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 
Merge pull request !657 from puhui999/feature/mall_product
 2023-10-10 12:39:26 +00:00
YunaiV
150a1c9771 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑） 2023-10-10 20:38:20 +08:00
YunaiV
2e5cc0537b 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中 2023-10-10 19:20:12 +08:00
puhui999
cfbc8b4849 拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 2023-10-10 17:21:37 +08:00
puhui999
bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2023-10-10 15:30:58 +08:00
puhui999
fdbebc406c 秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题 2023-10-10 10:57:17 +08:00
puhui999
42fcbe0501 砍价活动：完成订单取消时恢复活动库存 2023-10-10 10:47:25 +08:00
youkehai
bc781d9473 fix: 【工作流】按 review 修改代码 2023-10-10 10:46:16 +08:00
puhui999
245f14b8f1 秒杀活动：完成订单取消时恢复活动库存和商品库存 2023-10-10 10:25:57 +08:00