From a50928cc8fe098a9e1d484bd5e69e9d14938da12 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期一, 28 十一月 2022 14:27:06 +0800
Subject: [PATCH] 店铺列表查询接口修改
---
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java | 2 +-
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 3 +++
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 4 ++--
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java | 2 +-
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 6 ++++--
ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java | 2 ++
ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java | 4 ++++
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 4 ++--
8 files changed, 19 insertions(+), 8 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..05dc82f 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
@@ -51,8 +51,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));
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
index 9d449bd..29683d4 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
@@ -53,4 +53,8 @@
@ApiModelProperty("鎽勫儚澶�")
@TableField("video_id")
private String videoId;
+
+ @ApiModelProperty("搴楅摵鐘舵��")
+ @TableField("status")
+ private String status;
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
index 850702c..78f60d9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
@@ -12,6 +12,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
/**
* <p>
@@ -24,6 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_video_point")
+@NoArgsConstructor
public class VideoPoint implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
index 9cc6c93..bb03158 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
@@ -15,5 +15,5 @@
*/
public interface StoreInfoMapper extends BaseMapper<StoreInfo> {
- Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword);
+ Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword,String status);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
index 93bea65..b5f1b50 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
@@ -22,7 +22,7 @@
* @param pageNum 椤电爜
* @return 鍒嗛〉瀹炰綋
*/
- Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum);
+ Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status);
/**
* 璇诲彇excel鏂囦欢鍔ㄦ�佸姞杞芥枃浠�
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index e13c468..2c77c16 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -44,11 +44,11 @@
@Override
- public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
+ public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status) {
Page<StoreInfo> storeInfoPage = new Page<>();
storeInfoPage.setSize(pageSize);
storeInfoPage.setCurrent(pageNum);
- Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword);
+ Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword,status);
page.getRecords().forEach(x->x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
return page;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
index d4b73db..dcb43f8 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -69,9 +69,9 @@
@TableField("store_score")
private BigDecimal storeScore;
- @ApiModelProperty("闂ㄥ簵绉垎")
+ @ApiModelProperty("瑙嗛鐐逛綅")
@TableField(" relation_video")
- private BigDecimal relationVideo;
+ private String relationVideo;
@ApiModelProperty("闂ㄥ簵绫诲瀷")
@TableField("type")
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index abc4a0c..1142b20 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -25,6 +25,9 @@
<if test="keyword!=null and keyword!=''">
t1.store_name LIKE CONCAT('%', #{keyword}, '%')
</if>
+ <if test="status!=null and status!='' and status!='0' ">
+ t1.status = #{status}
+ </if>
</where>
order by t1.id desc
</select>
--
Gitblit v1.8.0