owen
|
5819b08740
|
交易：Review修改
|
2023-10-03 21:25:23 +08:00 |
|
owen
|
3c5917a6cd
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-03 21:21:48 +08:00 |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
2023-10-03 21:21:11 +08:00 |
|
YunaiV
|
ac55a9657c
|
promotion：完善秒杀模块
|
2023-10-03 18:41:41 +08:00 |
|
YunaiV
|
c66b4e7bc0
|
code review：日志清理 Job
|
2023-10-03 11:02:33 +08:00 |
|
YunaiV
|
1bc1be14fb
|
Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2023-10-03 10:33:22 +08:00 |
|
YunaiV
|
df4716d5a1
|
code review：分销
|
2023-10-03 10:23:40 +08:00 |
|
芋道源码
|
d874346d42
|
!649 Review代码修改
Merge pull request !649 from 疯狂的世界/feature/mall_product
|
2023-10-02 15:58:31 +00:00 |
|
owen
|
b7359706db
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-02 23:52:25 +08:00 |
|
owen
|
d0f0bc5888
|
分销：调整推广人列表查询方式
|
2023-10-02 23:51:49 +08:00 |
|
owen
|
7fdd36d979
|
Review代码修改
|
2023-10-02 21:27:46 +08:00 |
|
YunaiV
|
1f910992d6
|
trade：新增是否自提的配置项
|
2023-10-02 21:18:52 +08:00 |
|
j-sentinel
|
2f0483ce9f
|
[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
2023-10-02 19:18:36 +08:00 |
|
YunaiV
|
fdb10aeced
|
trade：优化运费模版的实现
|
2023-10-02 18:30:14 +08:00 |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
2023-10-02 15:44:41 +08:00 |
|
YunaiV
|
0c1f5c9582
|
trade：完善订单详情
|
2023-10-02 10:34:52 +08:00 |
|
YunaiV
|
f8b4a08fae
|
code review：访问日志、错误日志的清理 Job 实现
|
2023-10-02 00:06:28 +08:00 |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
YunaiV
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
2023-10-01 22:00:31 +08:00 |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2023-10-01 21:59:51 +08:00 |
|
芋道源码
|
4f7d6b4959
|
!643 订单：完善拼团活动和一些 TODO
Merge pull request !643 from puhui999/feature/mall_product
|
2023-10-01 13:56:43 +00:00 |
|
芋道源码
|
00c2153fd3
|
!646 ApiAccessLog、ApiErrorLog、JobLog 3 个日志的 定时 物理清理
Merge pull request !646 from lanxindx/feature/mall_product
|
2023-10-01 13:55:00 +00:00 |
|
owen
|
abfebebdd5
|
交易：增加 积分抵扣计算器 单元测试
|
2023-10-01 17:12:33 +08:00 |
|
j-sentinel
|
11921fab5a
|
[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
2023-10-01 16:53:17 +08:00 |
|
owen
|
afd306a71d
|
交易：增加 赠送积分计算器 单元测试
|
2023-10-01 16:23:41 +08:00 |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:21 +08:00 |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:54 +08:00 |
|
owen
|
a04a3a27a9
|
Review代码修改
|
2023-09-30 23:41:11 +08:00 |
|
puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-30 23:35:19 +08:00 |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
2023-09-30 23:34:45 +08:00 |
|
owen
|
7d68bdc7c8
|
分销：重构下级分销统计
|
2023-09-30 23:30:06 +08:00 |
|
owen
|
cafa938ff4
|
common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间
|
2023-09-30 22:21:47 +08:00 |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-30 22:09:49 +08:00 |
|
YunaiV
|
3875c80471
|
wallet：钱包支付，接入 user 付款界面
|
2023-09-30 22:08:15 +08:00 |
|
owen
|
d2c5eaf916
|
优惠券：重构是否领取检查方式
|
2023-09-30 22:05:11 +08:00 |
|
owen
|
aaa01de21d
|
分销：修改佣金排名查询算法
|
2023-09-30 19:55:18 +08:00 |
|
owen
|
d0d21b2787
|
优惠券：新增/修改时，校验对应的商品、分类是否存在
|
2023-09-30 19:39:02 +08:00 |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2023-09-30 17:49:38 +08:00 |
|
owen
|
fc432ba073
|
优惠券：新人券使用 MQ 发放
|
2023-09-30 17:29:32 +08:00 |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2023-09-30 15:50:13 +08:00 |
|
kehaiyou
|
d7ae944438
|
feat: 【工作流】--减签逻辑优化
|
2023-09-30 15:35:14 +08:00 |
|
kehaiyou
|
cd678e997a
|
feat: 【工作流】--减签和加签共用处理父任务逻辑
|
2023-09-30 14:56:16 +08:00 |
|
owen
|
be6399238b
|
会员详情，查询钱包信息
|
2023-09-30 12:40:22 +08:00 |
|
芋道源码
|
86e2523069
|
!638 修改springdoc版本，解决Swagger文档都是form提交。
Merge pull request !638 from fangyuan/master
|
2023-09-30 04:35:25 +00:00 |
|
YunaiV
|
3489144757
|
新任务：日志的清理 job
|
2023-09-30 12:31:18 +08:00 |
|
YunaiV
|
367b45e3bd
|
code review：数据统计
|
2023-09-30 12:30:01 +08:00 |
|
puhui999
|
597eacaaeb
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2023-09-30 11:35:51 +08:00 |
|
puhui999
|
0b35d4a7e3
|
订单：完善拼团活动部分 TODO
|
2023-09-30 11:27:24 +08:00 |
|