From 5f436542d9af3cd5a7d0044eb344e5a6025996e6 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 5 Dec 2025 00:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heyu/api/data/dao/vv/VvCommentDao.java | 19 +++++---- .../api/data/entity/vv/VvCommentEntity.java | 21 +++++++++- .../api/data/enums/CommentLevelEnums.java | 39 +++++++++++++++++++ .../java/com/test/xxx/MysqlMain_update.java | 2 +- .../alibaba/request/vv/AppCommentRequest.java | 8 ++++ .../controller/vv/AppCommentController.java | 25 +++++++++++- .../vv/AppShoppingCartController.java | 4 +- 7 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 api-mapper/src/main/java/com/heyu/api/data/enums/CommentLevelEnums.java 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 acf044d..053e199 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 @@ -73,19 +73,18 @@ public interface VvCommentDao extends BaseMapper { List selectNotLogin(IPage page, @IF Long productId, @IF String status, - @IF @OrderBy(VvCommentEntity.create_timestamp) String createTimestampSort); + @IF String level, + @IF @OrderBy(VvCommentEntity.create_timestamp) String createTimestampSort + ); - - - @OrderBy(VvCommentEntity.id_) - List selectLogin(IPage page, - @IF Long productId, - - @LBracket Long buyerId, - @OR @RBracket String status, - + @OrderBy(VvCommentEntity.id_) + List selectLogin(IPage page, + @IF String level, + @IF Long productId, + @LBracket Long buyerId, + @OR @RBracket String status, @IF @OrderBy(VvCommentEntity.create_timestamp) String createTimestampSort); 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 7d8dae1..c4a91b8 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 @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *评论表 * @author quyixiao -* @since 2025-12-04 +* @since 2025-12-05 */ @Data @@ -49,6 +49,7 @@ private static final long serialVersionUID = 1L; public final static String agree_user = CLASS_NAME + "agree_user"; // 同意用户 public final static String reject_user = CLASS_NAME + "reject_user"; // 拒绝用户 public final static String avatar_ = CLASS_NAME + "avatar"; // 头像 + public final static String level_ = CLASS_NAME + "level"; // 好:good，中:common，差:notgood // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -106,6 +107,8 @@ private static final long serialVersionUID = 1L; private String rejectUser; //头像 private String avatar; + //好:good，中:common，差:notgood + private String level; /** * * @return @@ -526,6 +529,21 @@ private static final long serialVersionUID = 1L; this.avatar = avatar; } + /** + * 好:good，中:common，差:notgood + * @return + */ + public String getLevel() { + return level; + } + /** + * 好:good，中:common，差:notgood + * @param level + */ + public void setLevel(String level) { + this.level = level; + } + @Override public String toString() { return "VvCommentEntity{" + @@ -557,6 +575,7 @@ private static final long serialVersionUID = 1L; ",agreeUser=" + agreeUser + ",rejectUser=" + rejectUser + ",avatar=" + avatar + + ",level=" + level + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/CommentLevelEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/CommentLevelEnums.java new file mode 100644 index 0000000..311cada --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/CommentLevelEnums.java @@ -0,0 +1,39 @@ +package com.heyu.api.data.enums; + +public enum CommentLevelEnums { + + + + good("good","好"), + common("common","中"), + notgood("notgood","差"), + ; + + + + + private String level; + + private String desc ; + + CommentLevelEnums(String level, String desc) { + this.level = level; + this.desc = desc; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 2d90d6b..9d7aca8 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -48,7 +48,7 @@ public class MysqlMain_update { } List list = new ArrayList(); - list.add(new TablesBean("vv_reverse_order")); + list.add(new TablesBean("vv_comment")); Map map = MysqlUtil2ShowCreateTable.getComments(); for (int i = 0; i < list.size(); i++) { diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java index c048938..8553378 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java @@ -20,4 +20,12 @@ public class AppCommentRequest extends AppBaseRequest { */ private String createTimestampSort; + + /*** + * 好:good + * 中:common + * 差:notgood + */ + private String level; + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java index 9a6d072..00e8fea 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java @@ -9,6 +9,7 @@ import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.vv.VvCommentDTO; import com.heyu.api.data.entity.vv.*; +import com.heyu.api.data.enums.CommentLevelEnums; import com.heyu.api.data.enums.CommentStatusEnums; import com.heyu.api.data.utils.R; import com.heyu.api.utils.ISelect; @@ -76,6 +77,7 @@ public class AppCommentController { @Override public List doSelect(IPage page) { return vvCommentDao.selectLogin(page, + appCommentRequest.getLevel(), appCommentRequest.getProductId(), appCommentRequest.getBuyerId(), CommentStatusEnums.approval_pass.getStatus(), @@ -91,12 +93,12 @@ public class AppCommentController { return vvCommentDao.selectNotLogin(page, appCommentRequest.getProductId(), CommentStatusEnums.approval_pass.getStatus(), + appCommentRequest.getLevel(), appCommentRequest.getCreateTimestampSort() ); } }); } - List vvCommentEntities = pageUtils.getRows(); List vvCommentDTOS = new ArrayList<>(); @@ -171,6 +173,26 @@ public class AppCommentController { List vvSkuPropertyValueEntities = vvSkuPropertyValueDao.selectVvSkuPropertyValueBySkuId(vvSkuEntity.getId()); + + //描述相符 1 ~ 5 + Integer descMatch =appCommentRequest.getDescMatch() !=null ?appCommentRequest.getDescMatch() :0 ; + //卖家服务 1 ~ 5 + Integer sellerService = appCommentRequest.getSellerService() !=null ? appCommentRequest.getSellerService() : 0 ; + //物流服务 1 ~ 5 + Integer logisticsService = appCommentRequest.getLogisticsService() !=null ? appCommentRequest.getLogisticsService() : 0 ; + + int levelCount = descMatch + sellerService + logisticsService; + + String level = CommentLevelEnums.good.getLevel(); + + if(levelCount > 0 && levelCount <= 5 ){ + level = CommentLevelEnums.notgood.getLevel(); + } else if (levelCount > 5 && levelCount <= 10){ + level = CommentLevelEnums.common.getLevel(); + }else { + level = CommentLevelEnums.good.getLevel(); + } + List propertyNameValues = new ArrayList<>(); for (VvSkuPropertyValueEntity vvSkuPropertyValueEntity : vvSkuPropertyValueEntities) { PropertyNameValue propertyNameValue = new PropertyNameValue(); @@ -181,6 +203,7 @@ public class AppCommentController { vvCommentEntity.setSkuInfo(JSON.toJSONString(propertyNameValues)); vvCommentEntity.setStatus(CommentStatusEnums.wait_approval.getStatus()); + vvCommentEntity.setLevel(level); vvCommentEntity.setCreateTimestamp(System.currentTimeMillis()); vvCommentEntity.setServiceComment(appCommentRequest.getServiceComment()); vvCommentEntity.setDescMatch(appCommentRequest.getDescMatch()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java index aaf9f89..f2933c7 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java @@ -153,9 +153,9 @@ public class AppShoppingCartController { } /*** - * 列表 + * /app/shipping/cart/delete */ - @Describe("删除购买车中商品") + @Describe("删除购物车中商品") @RequestMapping("/delete") public R delete(AppShippingCartDeleteRequest appShippingCartDeleteRequest) { vvShoppingCartDao.deleteVvShoppingCartByIds(appShippingCartDeleteRequest.getShoppingCartIds());