puhui999
|
ce77d510bb
|
拼团记录：添加拼团记录后台管理接口
|
2023-10-06 20:27:22 +08:00 |
|
owen
|
383439f902
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-06 14:17:14 +08:00 |
|
owen
|
4f33a0c9c0
|
统计：交易统计Review修改
|
2023-10-06 14:15:59 +08:00 |
|
芋道源码
|
a76760c419
|
!653 完善拼团活动下单流程
Merge pull request !653 from puhui999/feature/mall_product
|
2023-10-06 02:20:21 +00:00 |
|
YunaiV
|
8e7b295d24
|
trade：砍价记录的详情 100%
|
2023-10-06 10:17:41 +08:00 |
|
YunaiV
|
5f57cc6247
|
trade：砍价记录的详情 50%
|
2023-10-06 02:06:38 +08:00 |
|
puhui999
|
3d51c67f1a
|
拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存
|
2023-10-06 01:43:56 +08:00 |
|
puhui999
|
92da91a7dc
|
订单：修改订单收货地址添加日志记录
|
2023-10-06 01:32:57 +08:00 |
|
puhui999
|
9d7285c4ed
|
营销活动：实现 list-by-spu-ids 接口
|
2023-10-06 01:19:32 +08:00 |
|
puhui999
|
07493bc7e5
|
营销活动：实现 list-by-spu-id 接口
|
2023-10-06 01:04:36 +08:00 |
|
puhui999
|
3f6f7f404b
|
拼团活动：更改创建拼团记录的校验方式
|
2023-10-06 00:24:40 +08:00 |
|
puhui999
|
474eebd8c9
|
拼团活动：更改创建拼团记录的校验方式
|
2023-10-06 00:20:00 +08:00 |
|
puhui999
|
f732e7a750
|
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/bargain/BargainRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
|
2023-10-06 00:05:28 +08:00 |
|
puhui999
|
038e23a6b3
|
拼团活动：完善拼团 app-api 相关接口
|
2023-10-06 00:03:03 +08:00 |
|
YunaiV
|
aec8e853e4
|
trade：完善砍价的下单流程
|
2023-10-05 23:24:44 +08:00 |
|
puhui999
|
0b2943ba8b
|
拼团活动：完善拼团下单金额结算
|
2023-10-05 21:28:38 +08:00 |
|
puhui999
|
07d6ab5842
|
拼团活动：完善 TradeCombinationHandler
|
2023-10-05 19:14:19 +08:00 |
|
YunaiV
|
1bda3c8b53
|
promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！
|
2023-10-05 17:22:17 +08:00 |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2023-10-05 12:43:14 +08:00 |
|
YunaiV
|
269da3d56d
|
promotion：新增砍价记录列表
|
2023-10-05 12:07:05 +08:00 |
|
YunaiV
|
cd45be1fe2
|
promotion：优化砍价活动的分页结果
|
2023-10-05 02:18:14 +08:00 |
|
YunaiV
|
16e436a0f5
|
promotion：增加助力砍价的接口
|
2023-10-05 00:05:20 +08:00 |
|
YunaiV
|
cc087e4eca
|
promotion：增加创建砍价的接口
|
2023-10-04 21:55:05 +08:00 |
|
YunaiV
|
a37427c355
|
stat：增加用户统计的设计
|
2023-10-04 18:53:49 +08:00 |
|
YunaiV
|
c5824eedf7
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2023-10-04 17:33:14 +08:00 |
|
YunaiV
|
6f39b2c030
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2023-10-04 17:30:07 +08:00 |
|
YunaiV
|
8dbabb9efc
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2023-10-04 11:29:38 +08:00 |
|
owen
|
7a15b340b0
|
交易：核销
|
2023-10-04 10:51:36 +08:00 |
|
owen
|
60ea719b46
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
|
2023-10-04 09:12:48 +08:00 |
|
owen
|
8e905f706d
|
交易：核销
|
2023-10-04 09:11:51 +08:00 |
|
YunaiV
|
dc1347184f
|
code review：拼团、砍价活动
|
2023-10-04 00:47:17 +08:00 |
|
YunaiV
|
20f5834d9a
|
trade：价格计算时，接入优惠劵逻辑
|
2023-10-04 00:30:03 +08:00 |
|
YunaiV
|
a1e9bedf34
|
promotion：完善秒杀的 uniapp 接口
|
2023-10-03 21:45:51 +08:00 |
|
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 |
|