From 7a7d324af48e2134314c7b44b72e4e7d1fccf4f9 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 24 十月 2022 17:30:06 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java |   14 +++++++++-----
 1 files changed, 9 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 c56bec7..4af016d 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,6 +8,7 @@
 import com.ycl.dto.UmsStoreInfoParam;
 import com.ycl.entity.store.StoreInfo;
 import com.ycl.service.store.StoreInfoService;
+import com.ycl.vo.store.StoreInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +41,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));
     }
 
@@ -67,7 +68,10 @@
                 .storePhoto(umsStoreInfoParam.getStorephoto())
                 .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                 .storeNumber(utilNumber.createShopCode())
-                .storeScore(umsStoreInfoParam.getStorescore()).build();
+                .storeScore(umsStoreInfoParam.getStorescore())
+                .type(umsStoreInfoParam.getType())
+                .description(umsStoreInfoParam.getDescription())
+                .build();
         boolean success = storeInfoService.save(storeInfo);
         if (success) {
             return CommonResult.success(null);

--
Gitblit v1.8.0