From 1a057dd0b2fea02792504a6f52eaa0aaed07cf5c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 29 十一月 2022 15:43:37 +0800
Subject: [PATCH] fix: 上传处置问题
---
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 26 ++++++++++++++++++++------
1 files changed, 20 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 f85e5ab..d98ac78 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.controller.video.common.util.UtilNumber;
import com.ycl.dto.store.UmsStoreInfoParam;
import com.ycl.entity.store.StoreInfo;
+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;
@@ -51,8 +52,10 @@
@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));
}
@@ -75,16 +78,16 @@
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)
.build();
boolean success = storeInfoService.save(storeInfo);
if (success) {
@@ -132,5 +135,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