Commit Graph

2905 Commits

Author SHA1 Message Date
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
芋道源码
aee5f39a77
!315 秒杀活动相关
Merge pull request !315 from halfninety/feature/1.8.0-uniapp
2022-11-29 15:34:48 +00:00
halfninety
d6b426970b 序列化配置修改名称 2022-11-29 23:25:01 +08:00
halfninety
61c4053cbb 前端修改秒杀相关文件存放地址 2022-11-29 23:25:01 +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
2d78b02086 移除云片短信渠道,解决云片的安全风险 2022-11-25 21:04:40 +08:00
YunaiV
ea95115ffd 移除云片短信渠道,解决云片的安全风险 2022-11-25 20:22:04 +08:00
YunaiV
1cd9085c59 pay: PayNotifyJob 增加多租户的支持 2022-11-24 23:56:13 +08:00
YunaiV
0247fd5c69 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-23 21:09:30 +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
芋道源码
250d18ad13
!308 解决新建订单时,订单Id使用使用了address Id的问题
Merge pull request !308 from plimlips/N/A
2022-11-23 11:27:57 +00:00
sfmind
b4cde69ddb Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-23 00:22:07 +08:00
sfmind
49fe926cb8 uni-app调整vuex目录结构 2022-11-23 00:21:41 +08:00
sfmind
a72c68ce87 微调组件显示 2022-11-23 00:20:35 +08: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
8f6c37755c Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-20 01:05:13 +08:00
YunaiV
00e66216c5 trade:【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
sfmind
dc3e353a80 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-19 21:40:45 +08:00
sfmind
dbf2597d3b 重构页面抽取组件 2022-11-19 21:40:26 +08:00
YunaiV
35528e8267 trade:【交易售后】查询分页列表 2022-11-19 20:43:59 +08:00
sfmind
987c0218fa 删除多余无用文件 2022-11-19 20:38:56 +08:00
sfmind
fb097f7a5b uView版本升级到2.0.34 2022-11-19 20:38:24 +08:00
芋道源码
277cbce58f
!303 fix:加入异步注解配置后redis消费者不能正常消费
Merge pull request !303 from zy_2021/master
2022-11-19 10:50:28 +00: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
YunaiV
964f8cb35b Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-19 12:25:29 +08:00
YunaiV
e95402ab92 trade:【交易订单】调整交易订单的 afterSale 字段 2022-11-19 09:18:19 +08:00
LAPTOP-CNV4CMCJ\cheng
b3cea2d4bf Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-19 00:40:19 +08:00
LAPTOP-CNV4CMCJ\cheng
78ae018320 新增退款列表页 调整商品列表页的tab切换 2022-11-19 00:40:13 +08:00
zy
9b667448ea fix: 加入异步注解配置后redis消费者不能正常消费 2022-11-18 09:51:19 +08:00
YunaiV
cd2bc112cc trade:【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 2022-11-18 00:28:41 +08:00
YunaiV
ee1d362a7c trade:【交易售后】回调退款 2022-11-17 01:05:12 +08:00