From 39f08dd934cde1a02f1c243faa43174fa474c87f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 08 十一月 2022 11:11:35 +0800
Subject: [PATCH] 消息中心展示
---
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 4451d3c..1ffd7d9 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,11 +2,14 @@
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.entity.platform.store.StoreInfo;
-import com.ycl.service.platform.store.StoreInfoService;
+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;
@@ -29,6 +32,9 @@
private StoreInfoService storeInfoService;
@Autowired
+ UtilNumber utilNumber;
+
+ @Autowired
public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) {
this.storeInfoService = umsStoreInfoService;
}
@@ -36,10 +42,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));
}
@@ -54,15 +60,20 @@
@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())
- .storename(umsStoreInfoParam.getStorename())
+ .storeName(umsStoreInfoParam.getStorename())
.contact(umsStoreInfoParam.getContact())
- .storeaddr(umsStoreInfoParam.getStoreaddr())
- .storephoto(umsStoreInfoParam.getStorephoto())
- .idcardinfo(umsStoreInfoParam.getIdcardinfo())
- .storescore(umsStoreInfoParam.getStorescore()).build();
+ .storeAddress(umsStoreInfoParam.getStoreaddr())
+ .storePhoto(umsStoreInfoParam.getStorephoto())
+ .idCardInfo(umsStoreInfoParam.getIdcardinfo())
+ .storeNumber(utilNumber.createShopCode())
+ .storeScore(umsStoreInfoParam.getStorescore())
+ .type(umsStoreInfoParam.getType())
+ .description(umsStoreInfoParam.getDescription())
+ .build();
boolean success = storeInfoService.save(storeInfo);
if (success) {
return CommonResult.success(null);
@@ -84,7 +95,7 @@
}
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅")
- @RequestMapping(value = "/update", method = RequestMethod.GET)
+ @RequestMapping(value = "/update", method = RequestMethod.PUT)
@ResponseBody
public CommonResult update(@RequestBody StoreInfo storeInfo) {
boolean success = storeInfoService.updateById(storeInfo);
--
Gitblit v1.8.0