dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
2022-12-30 10:10:43 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
2022-12-23 19:12:45 +08:00 |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
2022-12-23 18:47:59 +08:00 |
|
YunaiV
|
92dde0b48b
|
product：优化更新 SKU 的代码
|
2022-12-15 21:31:52 +08:00 |
|
YunaiV
|
d453301455
|
product：完善 App 商品分页接口
|
2022-12-15 19:48:21 +08:00 |
|
YunaiV
|
652428a723
|
product：完善 App 商品详情接口
|
2022-12-14 22:02:07 +08:00 |
|
YunaiV
|
2f9eef589b
|
product：优化商品分类的代码
|
2022-12-14 20:32:44 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
2022-12-12 23:40:23 +08:00 |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
2022-12-12 22:25:31 +08:00 |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
2022-12-10 23:06:53 +08:00 |
|
YunaiV
|
b7d78a24a4
|
trade：完成管理后台的订单详情的简单对接
|
2022-12-10 21:02:32 +08:00 |
|
YunaiV
|
c5408965eb
|
trade：增加管理后台的订单详情接口
|
2022-12-10 17:53:44 +08:00 |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
2022-12-10 17:06:34 +08:00 |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
2022-12-10 11:52:11 +08:00 |
|
YunaiV
|
bddbedd781
|
增加城市库
|
2022-12-10 00:17:08 +08:00 |
|
YunaiV
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
2022-12-09 00:20:38 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
2022-12-08 00:07:14 +08:00 |
|
halfninety
|
9384ba0d52
|
秒杀相关VO添加example
|
2022-12-03 16:45:22 +08:00 |
|
halfninety
|
6808d3c163
|
完成秒杀时段todo，秒杀时段商品添加timeIds
|
2022-12-03 15:46:26 +08:00 |
|
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
2022-12-02 22:33:07 +08:00 |
|
YunaiV
|
0b9ddddd18
|
promotion：code review 秒杀的代码
|
2022-11-30 19:59:38 +08:00 |
|
halfninety
|
fc3245a06b
|
修改秒杀相关文件地址
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
54baad165d
|
秒杀时段新增修改时间段冲突校验。
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
7bc1ae5f35
|
秒杀活动增删改查
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
ea2a57f0a0
|
修改秒杀时段id
|
2022-11-29 23:24:59 +08:00 |
|
halfninety
|
83ee1c6129
|
秒杀活动，添加商品，分页查询
|
2022-11-29 23:24:59 +08:00 |
|
YunaiV
|
7056d89b0c
|
trade：完成交易订单的收货逻辑
|
2022-11-29 23:02:37 +08:00 |
|
YunaiV
|
66abe4a84b
|
trade：完成交易订单的发货逻辑
|
2022-11-27 19:42:49 +08:00 |
|
YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
2022-11-26 18:41:02 +08:00 |
|
YunaiV
|
e96422a47e
|
trade：完成支付成功后的回调，更新订单为已支付
|
2022-11-26 18:40:51 +08:00 |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
2022-11-24 23:56:13 +08:00 |
|
xingyu
|
61a6039fce
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-23 22:55:15 +08:00 |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
2022-11-23 22:54:44 +08:00 |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
2022-11-23 21:09:16 +08:00 |
|
芋道源码
|
1465d064dd
|
!307 调用获取地址参数顺序错误
Merge pull request !307 from plimlips/N/A
|
2022-11-23 11:28:26 +00:00 |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
2022-11-22 19:54:52 +08:00 |
|
YunaiV
|
64df5ce5f4
|
trade：【交易售后】增加会员取消售后
|
2022-11-20 23:07:14 +08:00 |
|
YunaiV
|
ed9c8d4a78
|
trade：【交易售后】增加售后日志
|
2022-11-20 22:54:30 +08:00 |
|
plimlips
|
453669c7d9
|
解决新建订单时,订单Id使用使用了address Id的问题
Signed-off-by: plimlips <156839224@qq.com>
|
2022-11-20 14:18:13 +00:00 |
|
plimlips
|
19a6fc79a2
|
调用获取地址参数顺序错误
Signed-off-by: plimlips <156839224@qq.com>
|
2022-11-20 12:05:18 +00:00 |
|
芋道源码
|
dbf237a1f3
|
修复 Swagger 注解错误，导致文档 404 问题
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
|
2022-11-20 09:28:30 +00:00 |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
2022-11-20 09:35:06 +08:00 |
|
YunaiV
|
00e66216c5
|
trade：【交易售后】查询分页列表的前端
|
2022-11-20 01:05:03 +08:00 |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
2022-11-19 20:43:59 +08:00 |
|
YunaiV
|
73b92190c6
|
trade：【交易售后】增加申请售后的单元测试
|
2022-11-19 14:34:59 +08:00 |
|
YunaiV
|
af71a19241
|
trade：【商品】sku 表增加 spu_name 字段，冗余
|
2022-11-19 12:25:53 +08:00 |
|