From 9bf5f19fa4395dd918701046fbe1040afcbd8e3a Mon Sep 17 00:00:00 2001 From: cl Date: Tue, 27 Jul 2021 14:17:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yami/shop/api/controller/ProdCommController.java | 4 ++-- .../com/yami/shop/api/security/YamiUserServiceImpl.java | 3 ++- .../src/main/java/com/yami/shop/dao/ProdCommMapper.java | 6 +++--- .../main/java/com/yami/shop/service/ProdCommService.java | 4 ++-- .../com/yami/shop/service/impl/ProdCommServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/ProdCommMapper.xml | 8 ++++---- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java index 7be65e2..1ccfa9d 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java @@ -43,7 +43,7 @@ public class ProdCommController { @GetMapping("/prodCommData") @ApiOperation(value = "返回商品评论数据(好评率 好评数量 中评数 差评数)", notes = "根据商品id获取") public ResponseEntity getProdCommData(Long prodId) { - return ResponseEntity.ok(prodCommService.getProdCommDataByProdId(prodId, SecurityUtils.getUser().getUserId())); + return ResponseEntity.ok(prodCommService.getProdCommDataByProdId(prodId)); } @GetMapping("/prodCommPageByUser") @@ -59,7 +59,7 @@ public class ProdCommController { @ApiImplicitParam(name = "evaluate", value = "-1或null 全部，0好评 1中评 2差评 3有图", required = true, dataType = "Long"), }) public ResponseEntity> getProdCommPageByProdId(PageParam page, Long prodId, Integer evaluate) { - return ResponseEntity.ok(prodCommService.getProdCommDtoPageByProdId(page, prodId, evaluate, SecurityUtils.getUser().getUserId())); + return ResponseEntity.ok(prodCommService.getProdCommDtoPageByProdId(page, prodId, evaluate)); } @PostMapping diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java index 716b525..1275bdb 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java @@ -22,6 +22,7 @@ import com.yami.shop.common.util.PrincipalUtil; import com.yami.shop.dao.UserMapper; import com.yami.shop.security.dao.AppConnectMapper; import com.yami.shop.security.enums.App; +import com.yami.shop.security.exception.UsernameNotFoundException; import com.yami.shop.security.exception.UsernameNotFoundExceptionBase; import com.yami.shop.security.model.AppConnect; import com.yami.shop.security.service.YamiUser; @@ -135,7 +136,7 @@ public class YamiUserServiceImpl implements YamiUserDetailsService { public YamiUser loadUserByUserMail(String userMail, String loginPassword) { User user = userMapper.getUserByUserMail(userMail); if (user == null) { - throw new YamiShopBindException("用户不存在"); + throw new UsernameNotFoundException("用户不存在"); } String paramPassword = passwordEncoder.encode(loginPassword); if (!passwordEncoder.matches(loginPassword, user.getLoginPassword())) { diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java index 9051951..8aededc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java @@ -20,11 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; public interface ProdCommMapper extends BaseMapper { - ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId, @Param("userId") String userId); + ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId); - IPage getProdCommDtoPageByProdId(@Param("page") Page page, @Param("prodId") Long prodId, @Param("evaluate") Integer evaluate, @Param("userId") String userId); + IPage getProdCommDtoPageByProdId(@Param("page") Page page, @Param("prodId") Long prodId, @Param("evaluate") Integer evaluate); IPage getProdCommDtoPageByUserId(Page page, @Param("userId") String userId); IPage getProdCommPage(Page page, @Param("prodComm") ProdComm prodComm); -} \ No newline at end of file +} diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java index ee4e4c1..1c49a11 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java @@ -28,11 +28,11 @@ import java.util.List; * @date 2019-04-19 10:43:57 */ public interface ProdCommService extends IService { - ProdCommDataDto getProdCommDataByProdId(Long prodId, String userId); + ProdCommDataDto getProdCommDataByProdId(Long prodId); IPage getProdCommDtoPageByUserId(Page page,String userId); - IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate, String userId); + IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate); IPage getProdCommPage(Page page,ProdComm prodComm); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java index 9c314e3..115be4a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java @@ -36,8 +36,8 @@ public class ProdCommServiceImpl extends ServiceImpl i private ProdCommMapper prodCommMapper; @Override - public ProdCommDataDto getProdCommDataByProdId(Long prodId, String userId) { - ProdCommDataDto prodCommDataDto=prodCommMapper.getProdCommDataByProdId(prodId, userId); + public ProdCommDataDto getProdCommDataByProdId(Long prodId) { + ProdCommDataDto prodCommDataDto=prodCommMapper.getProdCommDataByProdId(prodId); //计算出好评率 if(prodCommDataDto.getPraiseNumber() == 0||prodCommDataDto.getNumber() == 0){ prodCommDataDto.setPositiveRating(0.0); @@ -53,9 +53,9 @@ public class ProdCommServiceImpl extends ServiceImpl i } @Override - public IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate, String userId) { + public IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate) { - IPage prodCommDtos = prodCommMapper.getProdCommDtoPageByProdId(page, prodId, evaluate, userId); + IPage prodCommDtos = prodCommMapper.getProdCommDtoPageByProdId(page, prodId, evaluate); prodCommDtos.getRecords().forEach(prodCommDto -> { // 匿名评价 if (prodCommDto.getIsAnonymous() == 1) { diff --git a/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml b/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml index 4e97666..c662194 100644 --- a/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml @@ -37,8 +37,7 @@ count(CASE WHEN evaluate = 2 THEN 1 ELSE null END) AS negative_number, count(CASE WHEN pics is not null THEN 1 ELSE null END) AS pic_number FROM tz_prod_comm - WHERE prod_id = #{prodId} - and (status = 1 or user_id = #{userId}) + WHERE prod_id = #{prodId} and status = 1 @@ -78,13 +77,14 @@ from tz_prod_comm pc left join tz_user u on u.user_id=pc.user_id - where pc.prod_id = #{prodId} and (pc.status = 1 or pc.user_id = #{userId} ) + where pc.prod_id = #{prodId} and pc.status = 1 and pc.evaluate = #{evaluate} and pc.pics is not null + order by pc.rec_time desc - \ No newline at end of file +