From aeea62d121a1a8fd4475da30f1ef8b44b4776c7b Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 04 一月 2023 14:02:47 +0800
Subject: [PATCH] fix: 店铺消息发送

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
index 966c6e6..f529be7 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -1,8 +1,10 @@
 package com.ycl.controller.message;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.api.CommonResult;
 import com.ycl.bo.AdminUserDetails;
+import com.ycl.common.util.UtilNumber;
 import com.ycl.dto.message.MessageColumnParam;
 import com.ycl.entity.message.MessageColumn;
 import com.ycl.service.message.IMessageColumnService;
@@ -14,6 +16,8 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,7 +30,7 @@
  */
 @RestController
 @RequestMapping("/message_column")
-@Api(tags = "娑堟伅绠$悊")
+@Api(tags = "鏍忕洰绠$悊")
 public class MessageColumnController {
 
 
@@ -43,8 +47,27 @@
         //璁剧疆鍒涘缓浜�
         messageColumnParam.setCreateUser(user.getUserId());
         BeanUtils.copyProperties(messageColumnParam, messageColumn);
+        messageColumn.setColumnNumber(UtilNumber.getNumber("LM",0));
+        messageColumn.setCreateTime(new Date());
+        messageColumn.setUpdateTime(LocalDateTime.now());
+        messageColumn.setUpdateUser(user.getUserId());
         iMessageColumnService.save(messageColumn);
         return CommonResult.success(messageColumn);
+    }
+
+
+    @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏍忕洰")
+    @RequestMapping(value = "/getAllColumn", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult getAllColumn() {
+        return CommonResult.success(iMessageColumnService.listAllColumn());
+    }
+
+    @ApiOperation(value = "鑾峰彇鐢ㄦ埛鐨勬爮鐩缃�")
+    @RequestMapping(value = "/getShowColumn", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult getShowColumn(@RequestParam Integer id) {
+        return CommonResult.success(iMessageColumnService.listColumnUser(id));
     }
 
     @ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
@@ -55,15 +78,15 @@
     }
 
 
-    @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
+    @ApiOperation("鑾峰彇鎸囧畾鏍忕洰")
     @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<MessageColumn> getItem(@PathVariable Long id) {
+    public CommonResult<MessageColumn> getColumn(@PathVariable Long id) {
         MessageColumn messageColumn = iMessageColumnService.getById(id);
         return CommonResult.success(messageColumn);
     }
 
-    @ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
+    @ApiOperation("淇敼鎸囧畾鏍忕洰")
     @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
     @ResponseBody
     public CommonResult update(@PathVariable Long id, @RequestBody MessageColumnParam messageColumnParam) {
@@ -73,6 +96,7 @@
         //璁剧疆鍒涘缓浜�
         messageColumnParam.setCreateUser(user.getUserId());
         BeanUtils.copyProperties(messageColumnParam, messageColumn);
+        messageColumn.setUpdateTime(LocalDateTime.now());
         boolean success = iMessageColumnService.updateById(messageColumn);
         if (success) {
             return CommonResult.success(null);

--
Gitblit v1.8.0