From f9bd4bfa21c1b0e750393cfe29ad95e38cc8d950 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 17 十一月 2022 15:17:33 +0800
Subject: [PATCH] bug

---
 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 1ffd7d9..f85e5ab 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -5,13 +5,15 @@
 import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonPage;
 import com.ycl.api.CommonResult;
-import com.ycl.common.util.UtilNumber;
-import com.ycl.dto.UmsStoreInfoParam;
+import com.ycl.controller.video.common.util.UtilNumber;
+import com.ycl.dto.store.UmsStoreInfoParam;
 import com.ycl.entity.store.StoreInfo;
 import com.ycl.service.store.StoreInfoService;
+import com.ycl.service.video.impl.IVideoPointService;
 import com.ycl.vo.store.StoreInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -35,6 +37,10 @@
     UtilNumber utilNumber;
 
     @Autowired
+    private IVideoPointService videoPointService;
+
+
+    @Autowired
     public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) {
         this.storeInfoService = umsStoreInfoService;
     }
@@ -42,6 +48,7 @@
     @ApiOperation("鏍规嵁闂ㄥ簵鍚嶇О鍒嗛〉鑾峰彇闂ㄥ簵鍒楄〃鍒楄〃")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鏌ヨ闂ㄥ簵")
     public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
                                                       @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
@@ -52,15 +59,19 @@
     @ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<StoreInfo> getItem(@PathVariable Long id) {
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鏌ヨ闂ㄥ簵")
+    public CommonResult<StoreInfoVO> getItem(@PathVariable Long id) {
         StoreInfo storeInfo = storeInfoService.getById(id);
-        return CommonResult.success(storeInfo);
+        StoreInfoVO vo = new StoreInfoVO();
+        BeanUtils.copyProperties(storeInfo, vo);
+        vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
+        return CommonResult.success(vo);
     }
 
     @ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    @LogSave(operationType = "闂ㄥ簵绠＄悊",contain = "娣诲姞闂ㄥ簵")
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "娣诲姞闂ㄥ簵")
     public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
         StoreInfo storeInfo = StoreInfo.builder()
                 .owner(umsStoreInfoParam.getOwner())
@@ -73,6 +84,7 @@
                 .storeScore(umsStoreInfoParam.getStorescore())
                 .type(umsStoreInfoParam.getType())
                 .description(umsStoreInfoParam.getDescription())
+                .videoId(umsStoreInfoParam.getVideoId())
                 .build();
         boolean success = storeInfoService.save(storeInfo);
         if (success) {
@@ -85,6 +97,7 @@
     @ApiOperation(value = "鏍规嵁id鍒犻櫎闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
     @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鍒犻櫎闂ㄥ簵")
     public CommonResult delete(@PathVariable Long id) {
         boolean success = storeInfoService.removeById(id);
         if (success) {
@@ -97,6 +110,7 @@
     @ApiOperation(value = "淇敼闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/update", method = RequestMethod.PUT)
     @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "淇敼闂ㄥ簵")
     public CommonResult update(@RequestBody StoreInfo storeInfo) {
         boolean success = storeInfoService.updateById(storeInfo);
         if (success) {
@@ -109,6 +123,7 @@
     @ApiOperation(value = "鏍规嵁excel妯℃澘鎵归噺瀵煎叆闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/add/excel", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "瀵煎叆闂ㄥ簵")
     public CommonResult addByExcel(MultipartFile file) {
         boolean success = storeInfoService.addByExcel(file);
         if (success) {

--
Gitblit v1.8.0