diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java index 58b3eb46..a5b1cc03 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java @@ -34,15 +34,18 @@ public interface YxStoreProductReplyMapper extends BaseMapperselect A.product_score as productScore,A.service_score as serviceScore," + "A.comment,A.merchant_reply_content as merchantReplyContent," + "A.merchant_reply_time as merchantReplyTime,A.pics as pictures,A.add_time as addTime," + "B.nickname,B.avatar,C.cart_info as cartInfo" + " from yx_store_product_reply A left join yx_user B " + "on A.uid = B.uid left join yx_store_order_cart_info C on A.unique = C.unique" + " where A.product_id=#{productId} and A.is_del=0 and A.reply_type='product' " + - "order by A.add_time DESC") - List selectReplyList(Page page, @Param("productId") int productId); + "and A.product_score = 5" + + "and A.product_score < 5 and A.product_score > 2" + + "and A.product_score < 2"+ + " order by A.add_time DESC") + List selectReplyList(Page page, @Param("productId") int productId,int type); /** * 根据ID获取查询对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java index f39cedcb..4b19aa3d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java @@ -26,7 +26,7 @@ public interface YxStoreProductReplyService extends BaseService getReplyList(int productId,int page, int limit); + List getReplyList(int productId,int type,int page, int limit); int getInfoCount(Integer oid,String unique); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index f8aab7d3..7acd292c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -3,6 +3,8 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.modules.shop.mapper.YxStoreProductReplyMapper; import co.yixiang.modules.shop.service.YxStoreProductReplyService; @@ -10,25 +12,21 @@ import co.yixiang.modules.shop.web.dto.ReplyCountDTO; import co.yixiang.modules.shop.web.param.YxStoreProductReplyQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import java.util.stream.Collector; import java.util.stream.Collectors; @@ -91,6 +89,11 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl getReplyList(int productId,int page, int limit) { + public List getReplyList(int productId,int type,int page, int limit) { List newList = new ArrayList<>(); Page pageModel = new Page<>(page, limit); List list = yxStoreProductReplyMapper - .selectReplyList(pageModel,productId); + .selectReplyList(pageModel,productId,type); List list1 = list.stream().map(i ->{ YxStoreProductReplyQueryVo vo = new YxStoreProductReplyQueryVo(); BeanUtils.copyProperties(i,vo); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index c38c0e3b..58d9050d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -129,7 +129,7 @@ public class StoreProductController extends BaseController { @RequestParam(value = "type",defaultValue = "0") int type, @RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "limit",defaultValue = "10") int limit){ - return ApiResult.ok(replyService.getReplyList(id,page,limit)); + return ApiResult.ok(replyService.getReplyList(id,type,page,limit)); } /**