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 b0e7a91..94ae9bb 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 @@ -41,6 +41,9 @@ public interface VvCommentDao extends BaseMapper { @OrderBy(VvCommentEntity.id_) List selectVvCommentByCondition(IPage page, + @IF Long buyerId, + @IF @LIKE String buyerName, + @IF @LIKE String buyerPhone, @IF Long productId, @IF @LIKE Long productName, @IF Long skuId, 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 4d24767..2a5a099 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 @@ -37,6 +37,9 @@ private static final long serialVersionUID = 1L; 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"; // 有用数 + public final static String buyer_id = CLASS_NAME + "buyer_id"; // 买家id + public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称 + public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -46,7 +49,8 @@ private static final long serialVersionUID = 1L; private Date createTime; //修改时间 private Date modifyTime; - + //商品评论的内容 + private String productComment; //订单id private Long tradeOrderId; //sku_id @@ -61,9 +65,6 @@ private static final long serialVersionUID = 1L; private String status; //创建时间 private Long createTimestamp; - - //商品评论的内容 - private String productComment; //服务评论内容 private String serviceComment; //描述相符 @@ -74,6 +75,12 @@ private static final long serialVersionUID = 1L; private Integer logisticsService; //有用数 private Integer usefulCount; + //买家id + private Long buyerId; + //买家名称 + private String buyerName; + //买家手机号 + private String buyerPhone; /** * * @return @@ -329,6 +336,51 @@ private static final long serialVersionUID = 1L; this.usefulCount = usefulCount; } + /** + * 买家id + * @return + */ + public Long getBuyerId() { + return buyerId; + } + /** + * 买家id + * @param buyerId + */ + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } + + /** + * 买家名称 + * @return + */ + public String getBuyerName() { + return buyerName; + } + /** + * 买家名称 + * @param buyerName + */ + public void setBuyerName(String buyerName) { + this.buyerName = buyerName; + } + + /** + * 买家手机号 + * @return + */ + public String getBuyerPhone() { + return buyerPhone; + } + /** + * 买家手机号 + * @param buyerPhone + */ + public void setBuyerPhone(String buyerPhone) { + this.buyerPhone = buyerPhone; + } + @Override public String toString() { return "VvCommentEntity{" + @@ -349,6 +401,9 @@ private static final long serialVersionUID = 1L; ",sellerService=" + sellerService + ",logisticsService=" + logisticsService + ",usefulCount=" + usefulCount + + ",buyerId=" + buyerId + + ",buyerName=" + buyerName + + ",buyerPhone=" + buyerPhone + "}"; } } \ 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 d2a55ce..e39b838 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 @@ -65,6 +65,14 @@ public class VVCommentRequest { //有用数 private Integer maxUsefulCount; + //买家id + private Long buyerId; + //买家名称 + private String buyerName; + //买家手机号 + private String buyerPhone; + + } 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 2304ffc..3913972 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 @@ -33,7 +33,6 @@ public class CommentController { @Autowired private VvCommentDetailDao vvCommentDetailDao; - /*** * 列表 */ @@ -44,6 +43,9 @@ public class CommentController { @Override public List doSelect(IPage page) { return vvCommentDao.selectVvCommentByCondition(page, + vvCommentRequest.getBuyerId(), + vvCommentRequest.getBuyerName(), + vvCommentRequest.getBuyerPhone(), vvCommentRequest.getProductId(), vvCommentRequest.getProductName(), vvCommentRequest.getSkuId(), @@ -64,6 +66,7 @@ public class CommentController { } }); + List vvCommentEntities = pageUtils.getRows(); List commentDTOS = new ArrayList<>(); for (VvCommentEntity vvCommentEntity : vvCommentEntities) { @@ -77,7 +80,6 @@ public class CommentController { return R.ok().setData(pageUtils); } - /*** * 列表 */ @@ -103,6 +105,7 @@ public class CommentController { } } } + if (CollectionUtils.isNotEmpty(vvCommentDTO.getVvCommentDetailEntities())) { for (VvCommentDetailEntity vvCommentDetailEntity : vvCommentDTO.getVvCommentDetailEntities()) { vvCommentDetailEntity.setCommentId(vvCommentEntity.getId());