From d5865358dc32443bac629190bb18741d8af5093b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 14:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
index 34517d1..713a16a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -52,7 +52,7 @@
* 添加活动
*/
@PostMapping("/save")
- @ApiOperation(value = "添加活动", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "订单优惠活动-添加活动", tags = {"管理后台-活动管理"})
public R<Void> saveActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
orderActivityInfoService.save(orderActivityInfo);
return R.ok();
@@ -61,8 +61,8 @@
/**
* 删除活动
*/
- @PostMapping("/delete")
- @ApiOperation(value = "删除活动", tags = {"管理后台-活动管理-订单优惠活动"})
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "订单优惠活动-删除活动", tags = {"管理后台-活动管理"})
public R<Void> deleteActivityConfig(@RequestParam("id") Long id){
orderActivityInfoService.removeById(id);
return R.ok();
@@ -82,7 +82,7 @@
* 获取活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "获取活动列表", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "订单优惠活动-获取活动列表", tags = {"管理后台-活动管理"})
public R<Page<OrderActivityInfo>> list(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
OrderActivityInfo orderActivityInfo){
@@ -90,8 +90,8 @@
return R.ok(orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
.eq(orderActivityInfo.getId() != null, OrderActivityInfo::getId, orderActivityInfo.getId())
.eq(StringUtils.isNotEmpty(orderActivityInfo.getActivityName()), OrderActivityInfo::getActivityName, orderActivityInfo.getActivityName())
- .lt(orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
- .ge(orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
+ .lt(orderActivityInfo.getStatus() !=null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
+ .ge(orderActivityInfo.getStatus() !=null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
.eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf())));
}
@@ -99,7 +99,7 @@
* 获取活动详情
*/
@GetMapping("/getDetailById")
- @ApiOperation(value = "获取活动详情", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "订单优惠活动-获取活动详情", tags = {"管理后台-活动管理"})
public R<OrderActivityInfo> getDetailById(@RequestParam("id") Long id){
return R.ok(orderActivityInfoService.getById(id));
}
--
Gitblit v1.7.1