From b2ce0501f657564b92aa92f65f4adbb3196622cb Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 15:06:39 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 1059df7..d155ebc 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
@@ -55,6 +55,7 @@
 	@PostMapping("/save")
 	@ApiOperation(value = "订单优惠活动-添加活动", tags = {"管理后台-活动管理"})
 	public R<Void> saveActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
+		orderActivityInfo.setIsShelf(0);
 		orderActivityInfoService.save(orderActivityInfo);
 		return R.ok();
 	}
@@ -98,6 +99,14 @@
 		page.getRecords().forEach(item -> {
 			LocalDateTime startTime = item.getStartTime();
 			LocalDateTime now = LocalDateTime.now();
+			LocalDateTime endTime = item.getEndTime();
+			if (endTime.isBefore(now)){
+				item.setStatus(2); //已结束
+			}else if (startTime.isBefore(now)){
+				item.setStatus(1); // 已开始
+			}else {
+				item.setStatus(0); // 未开始
+			}
 		});
 		return R.ok(page);
 	}

--
Gitblit v1.7.1