From 380ae40da6e5f5e8016d51a4dcac62a8e8908b6d Mon Sep 17 00:00:00 2001 From: pserimal Date: Thu, 29 Jun 2023 20:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9B=B8=E5=85=B3Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/mapper/HyContentInfoMapper.java | 4 ++-- .../src/main/resources/mapper/HyContentInfoMapper.xml | 10 ++++++---- .../cool/store/dto/content/ContentQueryTitlesDto.java | 2 +- .../java/com/cool/store/service/ContentService.java | 5 +++++ .../cool/store/service/impl/ContentServiceImpl.java | 10 +++++++++- .../com/cool/store/controller/ContentController.java | 2 +- .../com/cool/store/controller/ContentController.java | 2 +- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java index dad67e4e1..74d727768 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java @@ -41,9 +41,9 @@ public interface HyContentInfoMapper { /** - * B 端使用的动态查询 + * C 端使用的动态查询 */ - List queryContentListForB(ContentQueryListDto dto); + List queryContentListForC(ContentQueryListDto dto); /** * 根据contentId查询动态详情 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index 4fdbe7136..79d4650d9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -24,7 +24,7 @@ - id, content_title, subject, content_type, cover, content, status, deleted, create_time, update_time, + id, content_title, `subject`, content_type, cover, content, `status`, deleted, create_time, update_time, create_user_id, update_user_id @@ -165,6 +165,7 @@ and update_time <= #{endTime} + order by update_time desc - - select from hy_content_info where deleted = 0 - and status = 1 + and status = 0 and content_title like concat('%', #{contentTitle}, '%') @@ -200,6 +201,7 @@ and update_time <= #{endTime} + order by update_time desc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java index 90520f6b0..f0d085ade 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java @@ -7,6 +7,6 @@ import lombok.Data; public class ContentQueryTitlesDto { @ApiModelProperty("用户输入标题") - private String tittle; + private String title; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java index 07dc89a78..99ad039cf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java @@ -35,6 +35,11 @@ public interface ContentService { */ List queryContentList(ContentQueryListDto dto); + /** + * 查询动态列表 C 端用 + */ + List queryContentListToC(ContentQueryListDto dto); + /** * 查询动态详情 * @param contentId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index 844163244..ce827f359 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -75,7 +75,15 @@ public class ContentServiceImpl implements ContentService { */ @Override public List queryContentList(ContentQueryListDto dto) { - return contentInfoMapper.queryContentListForB(dto); + return contentInfoMapper.queryContentList(dto); + } + + /** + * 查询动态列表 C 端用 + */ + @Override + public List queryContentListToC(ContentQueryListDto dto) { + return contentInfoMapper.queryContentListForC(dto); } /** diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index 39bc4c38a..feaba9dcf 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -30,7 +30,7 @@ public class ContentController { @PostMapping("/queryTitles") @ApiOperation("搜索标题是否重复") public ResponseResult queryTitles(@RequestBody ContentQueryTitlesDto title) { - return ResponseResult.success(contentService.queryTitles(title.getTittle())); + return ResponseResult.success(contentService.queryTitles(title.getTitle())); } @PostMapping("/add") diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java index 8f4f03976..77e9cd611 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java @@ -29,7 +29,7 @@ public class ContentController { @ApiOperation("查询动态列表") public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = contentService.queryContentList(dto); + List list = contentService.queryContentListToC(dto); PageInfo page = new PageInfo<>(list); return ResponseResult.success(page); }