From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 22 四月 2025 14:33:02 +0800 Subject: [PATCH] 将华为云短信替换成阿里云短信 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java index 89470c5..159b064 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java @@ -8,6 +8,7 @@ import com.ruoyi.account.api.model.AppUser; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.feignClient.OrderClient; import com.ruoyi.order.model.Order; @@ -56,10 +57,12 @@ @GetMapping("/goodsList") @ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"}) - public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){ - List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0) - .eq(GoodsEvaluate::getStatus, 2).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "").orderByDesc(GoodsEvaluate::getCreateTime).list(); - for (GoodsEvaluate goodsEvaluate : list) { + public R<PageInfo<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId, Integer pageNum, Integer pageSize){ + PageInfo<GoodsEvaluate> pageInfo = new PageInfo<>(pageNum, pageSize); + PageInfo<GoodsEvaluate> page = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0) + .eq(GoodsEvaluate::getStatus, 2).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "") + .orderByDesc(GoodsEvaluate::getCreateTime).page(pageInfo); + for (GoodsEvaluate goodsEvaluate : page.getRecords()) { AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId()); if(null != appUserById){ goodsEvaluate.setUserName(appUserById.getName()); @@ -67,7 +70,7 @@ goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId())); } } - return R.ok(list); + return R.ok(page); } /** @@ -147,7 +150,7 @@ } if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())) { - usersPhoneList = appUserClient.getAppUserByPhone(goodsEvaluate.getPhone()).getData().stream().map(AppUser::getId).collect(Collectors.toList()); + usersPhoneList = appUserClient.getAppUserByPhoneNoFilter(goodsEvaluate.getPhone()).getData().stream().map(AppUser::getId).collect(Collectors.toList()); if (usersPhoneList.isEmpty()) { return R.ok(new Page<>()); } @@ -155,13 +158,14 @@ if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){ // 取交集 usersNameList.retainAll(usersPhoneList); + if (usersNameList.isEmpty())usersNameList.add(-1L); }else{ usersNameList.addAll(usersPhoneList); } Page<GoodsEvaluate> page = goodsEvaluateService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsEvaluate>() .in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds) .in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList) - .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus()) + .eq(goodsEvaluate.getStatus() != null && !goodsEvaluate.getStatus().equals(0), GoodsEvaluate::getStatus, goodsEvaluate.getStatus()) .eq(GoodsEvaluate::getDelFlag, 0) .orderByDesc(GoodsEvaluate::getCreateTime)); -- Gitblit v1.7.1