价目表 增加起止时间 结束时间搜索

alien-store/src/main/java/shop/alien/store/controller/StoreCuisineController.java

@@ -23,7 +23,9 @@ import shop.alien.store.service.StoreInfoService;
 import shop.alien.store.service.StorePriceService;
 import shop.alien.store.util.ai.AiGetPriceUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -146,7 +148,9 @@ public class StoreCuisineController {
             @ApiImplicitParam(name = "storeId", value = "商户id", dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "菜名", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "status", value = "状态：0-待审核 1-审核通过 2-审核拒绝", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "type", value = "类型：1-美食 2-通用", dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "type", value = "类型：1-美食 2-通用", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "startCreatedTime", value = "创建时间开始（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false),
+            @ApiImplicitParam(name = "endCreatedTime", value = "创建时间结束（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false)
     })
     @GetMapping("/getPage")
     public R<List<PriceListVo>> getPage(
@@ -156,11 +160,33 @@ public class StoreCuisineController {
             @RequestParam(required = false) String name,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = true) Integer type,
-            @RequestParam(required = false) Integer origin)
+            @RequestParam(required = false) Integer origin,
+            @RequestParam(required = false) String startCreatedTime,
+            @RequestParam(required = false) String endCreatedTime)
     {
-        log.info("StoreCuisineController.getPage?pageNum={},pageSize={},storeId={},name={},status={},type={}", pageNum, pageSize, storeId, name, status, type);
+        log.info("StoreCuisineController.getPage?pageNum={},pageSize={},storeId={},name={},status={},type={},startCreatedTime={},endCreatedTime={}", pageNum, pageSize, storeId, name, status, type, startCreatedTime, endCreatedTime);
         List<PriceListVo> priceListVo = new ArrayList<>();
 
+        // 解析时间参数
+        Date startTime = null;
+        Date endTime = null;
+        if (startCreatedTime != null && !startCreatedTime.isEmpty()) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                startTime = sdf.parse(startCreatedTime);
+            } catch (Exception e) {
+                log.warn("解析开始时间失败: {}", startCreatedTime, e);
+            }
+        }
+        if (endCreatedTime != null && !endCreatedTime.isEmpty()) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                endTime = sdf.parse(endCreatedTime);
+            } catch (Exception e) {
+                log.warn("解析结束时间失败: {}", endCreatedTime, e);
+            }
+        }
+
         if(type == 1){
             Page<StoreCuisine> page = new Page<>(pageNum, pageSize);
             LambdaQueryWrapper<StoreCuisine> queryWrapper = new LambdaQueryWrapper<>();
@@ -177,6 +203,13 @@ public class StoreCuisineController {
             if (status != null) {
                 queryWrapper.eq(StoreCuisine::getStatus, status);
             }
+            // 创建时间范围查询
+            if (startTime != null) {
+                queryWrapper.ge(StoreCuisine::getCreatedTime, startTime);
+            }
+            if (endTime != null) {
+                queryWrapper.le(StoreCuisine::getCreatedTime, endTime);
+            }
             queryWrapper.orderByDesc(StoreCuisine::getCreatedTime);
             IPage<StoreCuisine> result = storeCuisineService.page(page, queryWrapper);
             List<StoreCuisine> cuisineList = result.getRecords();
@@ -206,6 +239,13 @@ public class StoreCuisineController {
             }
             // 默认只查询已上架的菜品/套餐（shelf_status = 1）
             queryWrapper.eq(StorePrice::getShelfStatus, 1);
+            // 创建时间范围查询
+            if (startTime != null) {
+                queryWrapper.ge(StorePrice::getCreatedTime, startTime);
+            }
+            if (endTime != null) {
+                queryWrapper.le(StorePrice::getCreatedTime, endTime);
+            }
             queryWrapper.orderByDesc(StorePrice::getCreatedTime);
             IPage<StorePrice> result = storePriceService.page(page, queryWrapper);
             List<StorePrice> storePrices = result.getRecords();

alien-store/src/main/java/shop/alien/store/controller/StorePriceController.java

@@ -20,6 +20,8 @@ import shop.alien.util.encryption.JasyptEncryptorUtil;
 import shop.alien.util.encryption.StandardAesUtil;
 import shop.alien.util.encryption.properties.EncryptProperties;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -199,7 +201,9 @@ public class StorePriceController {
             @ApiImplicitParam(name = "storeId", value = "商户id", dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "名字", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "status", value = "状态：0-待审核 1-审核通过 2-审核拒绝", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "shelfStatus", value = "上下架状态：1-上架，2-下架", dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "shelfStatus", value = "上下架状态：1-上架，2-下架", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "startCreatedTime", value = "创建时间开始（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false),
+            @ApiImplicitParam(name = "endCreatedTime", value = "创建时间结束（yyyy-MM-dd HH:mm:ss）", dataType = "String", paramType = "query", required = false)
     })
     @GetMapping("/getPage")
     public R<IPage<StorePrice>> getPage(
@@ -209,9 +213,32 @@ public class StorePriceController {
             @RequestParam(required = false) String name,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Integer shelfStatus,
-            @RequestParam(required = false) Integer origin) {
-        log.info("StorePriceController.getPage?pageNum={},pageSize={},storeId={},name={},status={},shelfStatus={}",
-                pageNum, pageSize, storeId, name, status, shelfStatus);
+            @RequestParam(required = false) Integer origin,
+            @RequestParam(required = false) String startCreatedTime,
+            @RequestParam(required = false) String endCreatedTime) {
+        log.info("StorePriceController.getPage?pageNum={},pageSize={},storeId={},name={},status={},shelfStatus={},startCreatedTime={},endCreatedTime={}",
+                pageNum, pageSize, storeId, name, status, shelfStatus, startCreatedTime, endCreatedTime);
+        
+        // 解析时间参数
+        Date startTime = null;
+        Date endTime = null;
+        if (startCreatedTime != null && !startCreatedTime.isEmpty()) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                startTime = sdf.parse(startCreatedTime);
+            } catch (Exception e) {
+                log.warn("解析开始时间失败: {}", startCreatedTime, e);
+            }
+        }
+        if (endCreatedTime != null && !endCreatedTime.isEmpty()) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                endTime = sdf.parse(endCreatedTime);
+            } catch (Exception e) {
+                log.warn("解析结束时间失败: {}", endCreatedTime, e);
+            }
+        }
+        
         Page<StorePrice> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<StorePrice> queryWrapper = new LambdaQueryWrapper<>();
         if(null==origin){
@@ -229,6 +256,13 @@ public class StorePriceController {
         if (shelfStatus != null) {
             queryWrapper.eq(StorePrice::getShelfStatus, shelfStatus);
         }
+        // 创建时间范围查询
+        if (startTime != null) {
+            queryWrapper.ge(StorePrice::getCreatedTime, startTime);
+        }
+        if (endTime != null) {
+            queryWrapper.le(StorePrice::getCreatedTime, endTime);
+        }
         queryWrapper.orderByDesc(StorePrice::getCreatedTime);
         IPage<StorePrice> result = storePriceService.page(page, queryWrapper);
         return R.data(result);