From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug

---
 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 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 e52aff9..d63a3ba 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
@@ -8,7 +8,7 @@
 import com.ycl.common.util.UtilNumber;
 import com.ycl.dto.store.UmsStoreInfoParam;
 import com.ycl.entity.store.StoreInfo;
-import com.ycl.entity.video.VideoPoint;
+import com.ycl.entity.store.StoreScore;
 import com.ycl.service.store.StoreInfoService;
 import com.ycl.service.video.impl.IVideoPointService;
 import com.ycl.vo.store.StoreInfoVO;
@@ -49,22 +49,26 @@
     @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) {
-        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
+                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value = "status", required = false) String status
+    ) {
+        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum,status);
         return CommonResult.success(CommonPage.restPage(storeInfoPage));
     }
 
     @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);
         StoreInfoVO vo = new StoreInfoVO();
         BeanUtils.copyProperties(storeInfo, vo);
         vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
-        return CommonResult.success(storeInfo);
+        return CommonResult.success(vo);
     }
 
     @ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
@@ -74,16 +78,17 @@
     public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
         StoreInfo storeInfo = StoreInfo.builder()
                 .owner(umsStoreInfoParam.getOwner())
-                .storeName(umsStoreInfoParam.getStorename())
+                .storeName(umsStoreInfoParam.getStoreName())
                 .contact(umsStoreInfoParam.getContact())
-                .storeAddress(umsStoreInfoParam.getStoreaddr())
+                .storeAddress(umsStoreInfoParam.getStoreAddress())
                 .storePhoto(umsStoreInfoParam.getStorephoto())
                 .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                 .storeNumber(utilNumber.createShopCode())
-                .storeScore(umsStoreInfoParam.getStorescore())
                 .type(umsStoreInfoParam.getType())
                 .description(umsStoreInfoParam.getDescription())
-                .videoId(umsStoreInfoParam.getVideoId())
+                .videoId(umsStoreInfoParam.getRelationVideo())
+                .storeScore(100.0)
+                .status(umsStoreInfoParam.getStatus())
                 .build();
         boolean success = storeInfoService.save(storeInfo);
         if (success) {
@@ -96,6 +101,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) {
@@ -108,6 +114,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) {
@@ -120,6 +127,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) {
@@ -128,5 +136,16 @@
             return CommonResult.failed();
         }
     }
+
+    @ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵绉垎璇︽儏")
+    @RequestMapping(value = "/{id}/storeScore", method = RequestMethod.GET)
+    @ResponseBody
+    @LogSave(operationType = "闂ㄥ簵绉垎璇︽儏", contain = "闂ㄥ簵绉垎璇︽儏")
+    public CommonResult<Page<StoreScore>> getScoreList(@PathVariable Long id,
+                                                       @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+                                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+        Page<StoreScore> page = storeInfoService.getScoreList(id, pageSize, pageNum);
+        return CommonResult.success(page);
+    }
 }
 

--
Gitblit v1.8.0