From f27882f6dd24ea76bcb4a7fdb40f4b6c49dfd422 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 15:02:52 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 6 ++++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 2 +-
2 files changed, 5 insertions(+), 3 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 10756ae..1059df7 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
@@ -75,6 +75,7 @@
@PostMapping("/update")
@ApiOperation(value = "修改活动", tags = {"管理后台-活动管理-订单优惠活动"})
public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
+ orderActivityInfo.setId(Long.valueOf(orderActivityInfo.getIdStr()));
orderActivityInfoService.updateById(orderActivityInfo);
return R.ok();
}
@@ -96,6 +97,7 @@
.eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()));
page.getRecords().forEach(item -> {
LocalDateTime startTime = item.getStartTime();
+ LocalDateTime now = LocalDateTime.now();
});
return R.ok(page);
}
@@ -105,8 +107,8 @@
*/
@GetMapping("/getDetailById")
@ApiOperation(value = "订单优惠活动-获取活动详情", tags = {"管理后台-活动管理"})
- public R<OrderActivityInfo> getDetailById(@RequestParam("id") Long id){
- return R.ok(orderActivityInfoService.getById(id));
+ public R<OrderActivityInfo> getDetailById(@RequestParam("id") String id){
+ return R.ok(orderActivityInfoService.getById(Long.parseLong(id)));
}
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 85d4777..caeefba 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
@@ -17,7 +17,7 @@
@RestController
@RequestMapping("/region")
-@Api("地区")
+@Api(tags = "地区")
public class RegionController {
@Resource
private RegionService regionService;
--
Gitblit v1.7.1