besure_server

Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

mvm

plp

#1

bb82c631e9 统计：Review修改 owen 2023-10-16 13:00:14 +0800
ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-16 10:02:04 +0800
7345933d6b code review：文章管理 YunaiV 2023-10-16 09:57:57 +0800
df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-16 09:55:17 +0800
f5dac38ca5 商城：增加商城首页 owen 2023-10-16 09:51:20 +0800
69268b525a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-16 09:07:13 +0800
4359c584bb code review：拼团逻辑 YunaiV 2023-10-16 09:07:02 +0800
3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-16 08:46:44 +0800
fcbbbc737d wallet - 管理端, 充值套餐脚本 jason 2023-10-16 08:46:27 +0800
4f7c7f5619 wallet - 管理端钱包余额流水查询 jason 2023-10-16 08:36:28 +0800
0d45acaf20 营销活动：完善文章相关 app 端接口 puhui999 2023-10-15 22:41:18 +0800
7bc3b7b2ff

!666 营销活动：新增文章管理，文章分类管理 Merge pull request !666 from puhui999/feature/mall_product 芋道源码 2023-10-15 14:05:35 +0000
7e312aae02 初始化 crm 模块 YunaiV 2023-10-15 20:16:46 +0800
7cb8f8fab9 wallet - 管理端钱包余额查询 jason 2023-10-15 17:33:55 +0800
b009f0b058 application-local.yaml 恢复 puhui999 2023-10-15 16:43:04 +0800
26d3672668 营销活动: 文章分类管理软件包调整 puhui999 2023-10-15 16:40:27 +0800
1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-15 16:17:14 +0800
55eed1377a 营销活动: 新增文章管理 puhui999 2023-10-15 16:16:41 +0800
944e3862a5 修复敏感词检验问题 1.修复排序，优先使用较短的前缀失效问题 2.修复敏感词为单个字符校验失败问题 daiwencheng 2023-10-15 14:30:43 +0800
a47ab32800 营销活动: 新增文章分类管理 puhui999 2023-10-15 01:29:30 +0800
6e4a9c3b01 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-10-14 22:00:52 +0800
ca5e3f7bd1 优化最新的商城的 sql YunaiV 2023-10-14 22:00:30 +0800
8fd814e0c1

!636 测试站内信接口增加Member 用户类型的支持。 Merge pull request !636 from 风狗/feature/mall_product 芋道源码 2023-10-14 09:53:41 +0000
82fd800ad2

!641 操作日志搜索参数名修改 Merge pull request !641 from ligitee/N/A 芋道源码 2023-10-14 09:52:11 +0000
fa600dbb44

!662 【工作流】添加vue2版本的退回和委派前端代码 Merge pull request !662 from LiuMoffett/moffett 芋道源码 2023-10-14 09:51:00 +0000
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files YunaiV 2023-10-14 17:45:49 +0800
970e524088 code review：交易统计 YunaiV 2023-10-14 13:15:14 +0800
1ac2f2b5c2 code review：会员统计 YunaiV 2023-10-14 01:26:06 +0800
0eb86ca269 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-13 20:41:17 +0800
82545ddaac 优化 README.md，减少静态资源加载 YunaiV 2023-10-13 18:27:30 +0800
a4613f0af9 拼团活动: 完善 review 提到的问题 puhui999 2023-10-13 12:07:28 +0800
e06f61ef39 wallet - 充值套餐管理端 jason 2023-10-13 10:46:10 +0800
8cd7941fc3 wallet - 充值套餐管理端 jason 2023-10-13 10:43:04 +0800
04d491b90d 优化 README.md，减少静态资源加载 YunaiV 2023-10-13 09:39:40 +0800
625504333b 优化 README.md YunaiV 2023-10-13 09:35:23 +0800
3105d86b7d 优化 README.md YunaiV 2023-10-13 09:34:33 +0800
2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-12 22:21:17 +0800
571961b4da 充值套餐修改 jason 2023-10-12 22:20:42 +0800
7a9dbfe41d Merge remote-tracking branch 'origin/master' YunaiV 2023-10-12 21:59:04 +0800
b30754a0a4 同步最新 mall 代码 YunaiV 2023-10-12 21:58:56 +0800
a72869b97e code review：修复部分统计报错 YunaiV 2023-10-12 21:54:06 +0800
9a876cff3d feat:【工作流】添加vue2版本的退回和委派前端代码 liuxiaolu 2023-10-11 16:08:39 +0800
4be709b815 统计：Review修改 owen 2023-10-11 15:26:17 +0800
66cdf4ca4c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-11 15:06:09 +0800
fef808d88c code review：统计代码 YunaiV 2023-10-11 12:32:28 +0800
704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-11 11:30:03 +0800
670a098aa8 code review：拼团记录流程 YunaiV 2023-10-11 11:04:22 +0800
8d40f1d71a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-11 08:27:57 +0800
708af92a0f

!660 优化订单 OrderHandler 实现 Merge pull request !660 from 芋道源码/feature/mall_product_tmp 芋道源码 2023-10-10 23:51:10 +0000
b0179457ce 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑） YunaiV 2023-10-11 07:49:23 +0800
41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp YunaiV 2023-10-10 20:42:33 +0800
7181ccbcef

!657 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 Merge pull request !657 from puhui999/feature/mall_product 芋道源码 2023-10-10 12:39:26 +0000
150a1c9771 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑） YunaiV 2023-10-10 20:38:20 +0800
2e5cc0537b 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中 YunaiV 2023-10-10 19:20:12 +0800
cfbc8b4849 拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 puhui999 2023-10-10 17:21:37 +0800
bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 puhui999 2023-10-10 15:30:58 +0800
599d13b1ac feat: 随便测试 youkehai 2023-10-10 11:36:24 +0800
fdbebc406c 秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题 puhui999 2023-10-10 10:57:17 +0800
42fcbe0501 砍价活动：完成订单取消时恢复活动库存 puhui999 2023-10-10 10:47:25 +0800
bc781d9473 fix: 【工作流】按 review 修改代码 youkehai 2023-10-10 10:46:16 +0800
245f14b8f1 秒杀活动：完成订单取消时恢复活动库存和商品库存 puhui999 2023-10-10 10:25:57 +0800
2c10dde195 统计：修复错误 owen 2023-10-09 23:53:50 +0800
91d0bbf8b1 合并代码 owen 2023-10-09 23:40:11 +0800
74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-09 23:33:51 +0800
df16278a03 统计：会员统计 owen 2023-10-09 23:27:10 +0800
6388950ab2 code review：【工作流】—— 加签的实现 zhijiantianya@gmail.com 2023-10-09 20:57:23 +0800
831983e314 营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法 puhui999 2023-10-09 18:17:20 +0800
45a2cd70f0 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro zhijiantianya@gmail.com 2023-10-09 17:45:46 +0800
5d6faa8023 fix: 【工作流】-加减签父任务处理逻辑完善 youkehai 2023-10-09 16:40:31 +0800
e845872adc Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product puhui999 2023-10-09 16:26:42 +0800
57407a39d2 营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试 puhui999 2023-10-09 16:18:00 +0800
c869d99a0f 修复：启动报错-循环依赖 puhui999 2023-10-09 16:11:02 +0800
cd887511d8 营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试 puhui999 2023-10-09 16:18:00 +0800
e09f07475a 修复：启动保存-循环依赖 puhui999 2023-10-09 16:11:02 +0800
53e67c0437 拼团活动：完善 review 提到的问题 puhui999 2023-10-09 11:53:02 +0800
10af05066c feat: 【工作流】--任务列表只返回顶级任务，拼装成父子关系并返回 kehaiyou 2023-10-08 22:35:02 +0800
7b727d5ce2 code review：拼团记录流程 YunaiV 2023-10-08 21:14:54 +0800
781ec1028f

!656 拼团活动：完善 review 提到的问题 Merge pull request !656 from puhui999/feature/mall_product 芋道源码 2023-10-08 12:06:35 +0000
2c0f1121ca 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 17:46:48 +0800
2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-08 17:33:21 +0800
c71bdd158a 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 17:19:39 +0800
c8a9d68933 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 12:08:17 +0800
8a11ca8126 code review：拼团记录流程 YunaiV 2023-10-08 09:59:53 +0800
01e6140d67 code review：拼团记录流程 YunaiV 2023-10-08 09:53:09 +0800
99649bfdb8 code review：拼团记录流程 YunaiV 2023-10-08 07:43:25 +0800
6a38da4ad9 promotion：合并最新代码 YunaiV 2023-10-07 23:00:13 +0800
c917f01d83 promotion：code review 拼团相关的部分代码 YunaiV 2023-10-07 22:47:45 +0800
6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 puhui999 2023-10-07 18:46:19 +0800
1a0fda23b1 拼团记录：调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP puhui999 2023-10-07 17:11:25 +0800
89b240c1f9 订单：介入 TradeOrderHandler#cancelOrder puhui999 2023-10-07 16:58:40 +0800
c485c6e04d 订单：重构拼团下单流程更改为订单支付后再创建拼团记录 puhui999 2023-10-07 16:30:28 +0800
c95317577d Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-07 14:33:09 +0800
f40bd23f6a 拼团记录：完善拼团记录创建前的条件校验规则 puhui999 2023-10-07 14:30:25 +0800
ec2c3e508a promotion：优化拼团记录的详情代码 YunaiV 2023-10-07 13:58:12 +0800
c7b5df930e promotion：修复拼团下单时，相关字段记录不正确的情况。 YunaiV 2023-10-07 07:09:15 +0800
c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 YunaiV 2023-10-06 22:29:11 +0800
1d9db4874f

!654 拼团记录：完善拼团记录后台管理接口 Merge pull request !654 from puhui999/feature/mall_product 芋道源码 2023-10-06 14:00:23 +0000
6099786c1b 拼团记录：完善拼团记录后台管理接口 puhui999 2023-10-06 21:26:53 +0800
8b480c52cc Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-06 21:15:06 +0800
34bf360da6 trade：调整拼团活动列表接口 YunaiV 2023-10-06 21:04:37 +0800

Commit Graph Select branches Hide Pull Requests ck hhk liutao_branch main mvm plp #1 Mono Color

Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

mvm

plp

#1