diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvCommentDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvCommentDao.java index 695be8a..b0e7a91 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvCommentDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvCommentDao.java @@ -7,12 +7,11 @@ package com.heyu.api.data.dao.vv; * @author quyixiao * @since 2025-08-25 */ + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.data.entity.vv.VvCommentEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lz.mybatis.plugin.annotations.IF; -import com.lz.mybatis.plugin.annotations.LIKE; -import com.lz.mybatis.plugin.annotations.OrderBy; +import com.lz.mybatis.plugin.annotations.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,5 +46,22 @@ public interface VvCommentDao extends BaseMapper { @IF Long skuId, @IF Long tradeOrderId, @IF String status, + @IF @LIKE String productComment, + @IF @LIKE String serviceComment, + + @IF @GE @Column(VvCommentEntity.desc_match) Integer minDescMatch, + @IF @LE @Column(VvCommentEntity.desc_match)Integer maxDescMatch, + + @IF @GE @Column(VvCommentEntity.seller_service)Integer minSellerService, + @IF @LE @Column(VvCommentEntity.seller_service)Integer maxSellerService, + + @IF @GE @Column(VvCommentEntity.logistics_service)Integer minLogisticsService, + @IF @LE @Column(VvCommentEntity.logistics_service)Integer maxLogisticsService, + + @IF @GE @Column(VvCommentEntity.useful_count)Integer minUsefulCount, + @IF @LE @Column(VvCommentEntity.useful_count)Integer maxUsefulCount, + @IF @OrderBy(VvCommentEntity.create_timestamp) String createTimestampSort); + + } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dto/vv/VvCommentDTO.java b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/VvCommentDTO.java index 161e83f..071fc12 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dto/vv/VvCommentDTO.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/VvCommentDTO.java @@ -17,7 +17,7 @@ public class VvCommentDTO extends VvCommentEntity { public static void main(String[] args) { VvCommentDTO vvCommentDTO = new VvCommentDTO(); - vvCommentDTO.setContent("testn"); + vvCommentDTO.setProductComment("testn"); vvCommentDTO.setTradeOrderId(10L); diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvCommentEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvCommentEntity.java index ad954a1..4d24767 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvCommentEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvCommentEntity.java @@ -20,18 +20,23 @@ private static final long serialVersionUID = 1L; public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvCommentEntity:"; public final static String all = CLASS_NAME + "*"; - public final static String id_ = CLASS_NAME + "id"; // - public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 - public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 - public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 - public final static String content_ = CLASS_NAME + "content"; // 评论的内容 - public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单id - public final static String sku_id = CLASS_NAME + "sku_id"; // sku_id - public final static String product_id = CLASS_NAME + "product_id"; // 商品id - public final static String product_title = CLASS_NAME + "product_title"; // 商品标题 - public final static String sku_info = CLASS_NAME + "sku_info"; // sku信息 - public final static String status_ = CLASS_NAME + "status"; // 待审批 wait_approval 待审批, approval_pass，审批通过 , approval_not_pass 审批未通过，如果审批未通过，即自己可见，但别人不可见 。 - public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间 + public final static String id_ = CLASS_NAME + "id"; // + public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 + public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 + public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 + public final static String product_comment = CLASS_NAME + "product_comment"; // 商品评论的内容 + public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单id + public final static String sku_id = CLASS_NAME + "sku_id"; // sku_id + public final static String product_id = CLASS_NAME + "product_id"; // 商品id + public final static String product_title = CLASS_NAME + "product_title"; // 商品标题 + public final static String sku_info = CLASS_NAME + "sku_info"; // sku信息 + public final static String status_ = CLASS_NAME + "status"; // 待审批 wait_approval 待审批, approval_pass，审批通过 , approval_not_pass 审批未通过，如果审批未通过，即自己可见，但别人不可见 。 + public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间 + public final static String service_comment = CLASS_NAME + "service_comment"; // 服务评论内容 + public final static String desc_match = CLASS_NAME + "desc_match"; // 描述相符 + public final static String seller_service = CLASS_NAME + "seller_service"; // 卖家服务 + public final static String logistics_service = CLASS_NAME + "logistics_service"; // 物流服务 + public final static String useful_count = CLASS_NAME + "useful_count"; // 有用数 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -41,8 +46,7 @@ private static final long serialVersionUID = 1L; private Date createTime; //修改时间 private Date modifyTime; - //评论的内容 - private String content; + //订单id private Long tradeOrderId; //sku_id @@ -57,6 +61,19 @@ private static final long serialVersionUID = 1L; private String status; //创建时间 private Long createTimestamp; + + //商品评论的内容 + private String productComment; + //服务评论内容 + private String serviceComment; + //描述相符 + private Integer descMatch; + //卖家服务 + private Integer sellerService; + //物流服务 + private Integer logisticsService; + //有用数 + private Integer usefulCount; /** * * @return @@ -118,18 +135,18 @@ private static final long serialVersionUID = 1L; } /** - * 评论的内容 + * 商品评论的内容 * @return */ - public String getContent() { - return content; + public String getProductComment() { + return productComment; } /** - * 评论的内容 - * @param content + * 商品评论的内容 + * @param productComment */ - public void setContent(String content) { - this.content = content; + public void setProductComment(String productComment) { + this.productComment = productComment; } /** @@ -237,6 +254,81 @@ private static final long serialVersionUID = 1L; this.createTimestamp = createTimestamp; } + /** + * 服务评论内容 + * @return + */ + public String getServiceComment() { + return serviceComment; + } + /** + * 服务评论内容 + * @param serviceComment + */ + public void setServiceComment(String serviceComment) { + this.serviceComment = serviceComment; + } + + /** + * 描述相符 + * @return + */ + public Integer getDescMatch() { + return descMatch; + } + /** + * 描述相符 + * @param descMatch + */ + public void setDescMatch(Integer descMatch) { + this.descMatch = descMatch; + } + + /** + * 卖家服务 + * @return + */ + public Integer getSellerService() { + return sellerService; + } + /** + * 卖家服务 + * @param sellerService + */ + public void setSellerService(Integer sellerService) { + this.sellerService = sellerService; + } + + /** + * 物流服务 + * @return + */ + public Integer getLogisticsService() { + return logisticsService; + } + /** + * 物流服务 + * @param logisticsService + */ + public void setLogisticsService(Integer logisticsService) { + this.logisticsService = logisticsService; + } + + /** + * 有用数 + * @return + */ + public Integer getUsefulCount() { + return usefulCount; + } + /** + * 有用数 + * @param usefulCount + */ + public void setUsefulCount(Integer usefulCount) { + this.usefulCount = usefulCount; + } + @Override public String toString() { return "VvCommentEntity{" + @@ -244,7 +336,7 @@ private static final long serialVersionUID = 1L; ",isDelete=" + isDelete + ",createTime=" + createTime + ",modifyTime=" + modifyTime + - ",content=" + content + + ",productComment=" + productComment + ",tradeOrderId=" + tradeOrderId + ",skuId=" + skuId + ",productId=" + productId + @@ -252,6 +344,11 @@ private static final long serialVersionUID = 1L; ",skuInfo=" + skuInfo + ",status=" + status + ",createTimestamp=" + createTimestamp + + ",serviceComment=" + serviceComment + + ",descMatch=" + descMatch + + ",sellerService=" + sellerService + + ",logisticsService=" + logisticsService + + ",usefulCount=" + usefulCount + "}"; } } \ No newline at end of file diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVCommentRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVCommentRequest.java index 46ee155..d2a55ce 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVCommentRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVCommentRequest.java @@ -40,10 +40,31 @@ public class VVCommentRequest { */ private String status; + /*** * 排序 */ private String createTimestampSort; + //商品评论的内容 + private String productComment; + //服务评论内容 + private String serviceComment; + //描述相符 + private Integer minDescMatch; + private Integer maxDescMatch; + //卖家服务 + private Integer minSellerService; + private Integer maxSellerService; + //物流服务 + private Integer minLogisticsService; + private Integer maxLogisticsService; + + + //有用数 + private Integer minUsefulCount; + //有用数 + private Integer maxUsefulCount; + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CommentController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CommentController.java index 1053f21..2304ffc 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CommentController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/CommentController.java @@ -49,10 +49,21 @@ public class CommentController { vvCommentRequest.getSkuId(), vvCommentRequest.getTradeOrderId(), vvCommentRequest.getStatus(), + vvCommentRequest.getProductComment(), + vvCommentRequest.getServiceComment(), + vvCommentRequest.getMinDescMatch(), + vvCommentRequest.getMaxDescMatch(), + vvCommentRequest.getMinSellerService(), + vvCommentRequest.getMaxSellerService(), + vvCommentRequest.getMinLogisticsService(), + vvCommentRequest.getMaxLogisticsService(), + vvCommentRequest.getMinUsefulCount(), + vvCommentRequest.getMaxUsefulCount(), vvCommentRequest.getCreateTimestampSort() ); } }); + List vvCommentEntities = pageUtils.getRows(); List commentDTOS = new ArrayList<>(); for (VvCommentEntity vvCommentEntity : vvCommentEntities) {