From 1042347b372227bdb36da958fda8974d51c79e15 Mon Sep 17 00:00:00 2001
From: Oliver <1070107765@qq.com>
Date: 星期二, 08 十一月 2022 11:13:12 +0800
Subject: [PATCH] commit

---
 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 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 c56bec7..67e4601 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
@@ -2,14 +2,19 @@
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.dto.store.UmsStoreInfoParam;
 import com.ycl.entity.store.StoreInfo;
+import com.ycl.entity.video.VideoPoint;
 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.*;
@@ -33,6 +38,10 @@
     UtilNumber utilNumber;
 
     @Autowired
+    private IVideoPointService videoPointService;
+
+
+    @Autowired
     public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) {
         this.storeInfoService = umsStoreInfoService;
     }
@@ -40,10 +49,10 @@
     @ApiOperation("鏍规嵁闂ㄥ簵鍚嶇О鍒嗛〉鑾峰彇闂ㄥ簵鍒楄〃鍒楄〃")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<CommonPage<StoreInfo>> list(@RequestParam(value = "keyword", required = false) String keyword,
-                                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
-                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
-        Page<StoreInfo> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
+    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) {
+        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
         return CommonResult.success(CommonPage.restPage(storeInfoPage));
     }
 
@@ -52,12 +61,16 @@
     @ResponseBody
     public CommonResult<StoreInfo> getItem(@PathVariable Long id) {
         StoreInfo storeInfo = storeInfoService.getById(id);
+        StoreInfoVO vo = new StoreInfoVO();
+        BeanUtils.copyProperties(storeInfo,vo);
+        vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
         return CommonResult.success(storeInfo);
     }
 
     @ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绠$悊",contain = "娣诲姞闂ㄥ簵")
     public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
         StoreInfo storeInfo = StoreInfo.builder()
                 .owner(umsStoreInfoParam.getOwner())
@@ -67,7 +80,11 @@
                 .storePhoto(umsStoreInfoParam.getStorephoto())
                 .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                 .storeNumber(utilNumber.createShopCode())
-                .storeScore(umsStoreInfoParam.getStorescore()).build();
+                .storeScore(umsStoreInfoParam.getStorescore())
+                .type(umsStoreInfoParam.getType())
+                .description(umsStoreInfoParam.getDescription())
+                .videoId(umsStoreInfoParam.getVideoId())
+                .build();
         boolean success = storeInfoService.save(storeInfo);
         if (success) {
             return CommonResult.success(null);

--
Gitblit v1.8.0