提交修改
This commit is contained in:
quyixiao
parent
c665dd6f7a
commit
5f436542d9
@ -73,19 +73,18 @@ public interface VvCommentDao extends BaseMapper<VvCommentEntity> {
|
||||
List<VvCommentEntity> 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<VvCommentEntity> selectLogin(IPage page,
|
||||
@IF Long productId,
|
||||
|
||||
@LBracket Long buyerId,
|
||||
@OR @RBracket String status,
|
||||
|
||||
@OrderBy(VvCommentEntity.id_)
|
||||
List<VvCommentEntity> selectLogin(IPage page,
|
||||
@IF String level,
|
||||
@IF Long productId,
|
||||
@LBracket Long buyerId,
|
||||
@OR @RBracket String status,
|
||||
@IF @OrderBy(VvCommentEntity.create_timestamp) String createTimestampSort);
|
||||
|
||||
|
||||
|
||||
@ -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 +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -48,7 +48,7 @@ public class MysqlMain_update {
|
||||
}
|
||||
List<TablesBean> list = new ArrayList<TablesBean>();
|
||||
|
||||
list.add(new TablesBean("vv_reverse_order"));
|
||||
list.add(new TablesBean("vv_comment"));
|
||||
|
||||
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
|
||||
@ -20,4 +20,12 @@ public class AppCommentRequest extends AppBaseRequest {
|
||||
*/
|
||||
private String createTimestampSort;
|
||||
|
||||
|
||||
/***
|
||||
* 好:good
|
||||
* 中:common
|
||||
* 差:notgood
|
||||
*/
|
||||
private String level;
|
||||
|
||||
}
|
||||
|
||||
@ -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<VvCommentEntity> vvCommentEntities = pageUtils.getRows();
|
||||
List<VvCommentDTO> vvCommentDTOS = new ArrayList<>();
|
||||
|
||||
@ -171,6 +173,26 @@ public class AppCommentController {
|
||||
|
||||
List<VvSkuPropertyValueEntity> 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<PropertyNameValue> 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());
|
||||
|
||||
@ -153,9 +153,9 @@ public class AppShoppingCartController {
|
||||
}
|
||||
|
||||
/***
|
||||
* 列表
|
||||
* /app/shipping/cart/delete
|
||||
*/
|
||||
@Describe("删除购买车中商品")
|
||||
@Describe("删除购物车中商品")
|
||||
@RequestMapping("/delete")
|
||||
public R delete(AppShippingCartDeleteRequest appShippingCartDeleteRequest) {
|
||||
vvShoppingCartDao.deleteVvShoppingCartByIds(appShippingCartDeleteRequest.getShoppingCartIds());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user