From c85b8ad45ab8a02183bde5d66d025dc5b5718607 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 14:52:44 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 13 +++++++++----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 17 ++++-------------
2 files changed, 13 insertions(+), 17 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 713a16a..10756ae 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -87,12 +88,16 @@
@ApiParam("每一页数据大小") Integer pageSize,
OrderActivityInfo orderActivityInfo){
- return R.ok(orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
+ Page<OrderActivityInfo> page = 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() !=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())));
+ .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()));
+ page.getRecords().forEach(item -> {
+ LocalDateTime startTime = item.getStartTime();
+ });
+ return R.ok(page);
}
/**
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
index c01da9f..85d4777 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
@@ -23,22 +23,13 @@
private RegionService regionService;
/**
- * 获取省份列表
+ * 省市区级联
*/
@GetMapping("/getProvinceList")
- @ApiOperation("获取省份列表")
- public R<List<Region>> getProvinceList() {
+ @ApiOperation("省市区级联")
+ public R<List<Region>> getProvinceList(@ApiParam("父级id") @RequestParam Long parentId) {
return R.ok(regionService.list(new LambdaQueryWrapper<Region>()
- .eq(Region::getParentId, 0)));
+ .eq(Region::getParentId, parentId)));
}
- /**
- * 获取下级地区列表
- */
- @GetMapping("/getNextRegionList")
- @ApiOperation("获取下级地区列表")
- public R<List<Region>> getNextRegionList(@ApiParam("父级id") @RequestParam Long id) {
- return R.ok(regionService.list(new LambdaQueryWrapper<Region>()
- .eq(Region::getParentId, id)));
- }
}
--
Gitblit v1.7.1