puhui999
|
474eebd8c9
|
拼团活动：更改创建拼团记录的校验方式
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
038e23a6b3
|
拼团活动：完善拼团 app-api 相关接口
|
2 years ago |
YunaiV
|
aec8e853e4
|
trade：完善砍价的下单流程
|
2 years ago |
|
puhui999
|
0b2943ba8b
|
拼团活动：完善拼团下单金额结算
|
2 years ago |
|
puhui999
|
07d6ab5842
|
拼团活动：完善 TradeCombinationHandler
|
2 years ago |
|
YunaiV
|
1bda3c8b53
|
promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！
|
2 years ago |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2 years ago |
|
YunaiV
|
269da3d56d
|
promotion：新增砍价记录列表
|
2 years ago |
|
YunaiV
|
cd45be1fe2
|
promotion：优化砍价活动的分页结果
|
2 years ago |
|
YunaiV
|
16e436a0f5
|
promotion：增加助力砍价的接口
|
2 years ago |
|
YunaiV
|
cc087e4eca
|
promotion：增加创建砍价的接口
|
2 years ago |
|
YunaiV
|
a37427c355
|
stat：增加用户统计的设计
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
6f39b2c030
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
|
YunaiV
|
8dbabb9efc
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
owen
|
7a15b340b0
|
交易：核销
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
8e905f706d
|
交易：核销
|
2 years ago |
|
YunaiV
|
dc1347184f
|
code review：拼团、砍价活动
|
2 years ago |
|
YunaiV
|
20f5834d9a
|
trade：价格计算时，接入优惠劵逻辑
|
2 years ago |
|
YunaiV
|
a1e9bedf34
|
promotion：完善秒杀的 uniapp 接口
|
2 years ago |
|
owen
|
5819b08740
|
交易：Review修改
|
2 years ago |
|
owen
|
3c5917a6cd
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
2 years ago |
|
YunaiV
|
ac55a9657c
|
promotion：完善秒杀模块
|
2 years ago |
|
YunaiV
|
c66b4e7bc0
|
code review：日志清理 Job
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
df4716d5a1
|
code review：分销
|
2 years ago |
|
芋道源码
|
d874346d42
|
!649 Review代码修改
Merge pull request !649 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
owen
|
b7359706db
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
d0f0bc5888
|
分销：调整推广人列表查询方式
|
2 years ago |
|
owen
|
7fdd36d979
|
Review代码修改
|
2 years ago |
|
YunaiV
|
1f910992d6
|
trade：新增是否自提的配置项
|
2 years ago |
j-sentinel
|
2f0483ce9f
|
[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
2 years ago |
|
YunaiV
|
fdb10aeced
|
trade：优化运费模版的实现
|
2 years ago |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
2 years ago |
|
YunaiV
|
0c1f5c9582
|
trade：完善订单详情
|
2 years ago |
|
YunaiV
|
f8b4a08fae
|
code review：访问日志、错误日志的清理 Job 实现
|
2 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2 years ago |
|
芋道源码
|
4f7d6b4959
|
!643 订单：完善拼团活动和一些 TODO
Merge pull request !643 from puhui999/feature/mall_product
|
2 years ago |
|
芋道源码
|
00c2153fd3
|
!646 ApiAccessLog、ApiErrorLog、JobLog 3 个日志的 定时 物理清理
Merge pull request !646 from lanxindx/feature/mall_product
|
2 years ago |
|
owen
|
abfebebdd5
|
交易：增加 积分抵扣计算器 单元测试
|
2 years ago |
|
j-sentinel
|
11921fab5a
|
[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
2 years ago |
|
owen
|
afd306a71d
|
交易：增加 赠送积分计算器 单元测试
|
2 years ago |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2 years ago |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2 years ago |
|
owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2 years ago |