From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态
---
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
index ba61cd9..dde8bdf 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
@@ -26,12 +26,21 @@
@ApiModelProperty(value = "分类ID")
private Long categoryId;
-// @ApiModelProperty(value = "排序字段, 默认created_time")
-// private String order = "created_time";
+ @ApiModelProperty(value = "排序类型 1-综合排序 2-销量 3-价格 4-新品优先")
+ private Integer sortType;
//
-// @ApiModelProperty(value = "升序/降序", example = "asc/desc")
-// private String sort = "desc";
+ @ApiModelProperty(value = "升序/降序", example = "asc/desc")
+ private String sort = "desc";
@ApiModelProperty(value = "是否热卖", example = "1是2否")
private Integer isHot;
+
+ @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐", example = "2")
+ private Integer isNormal;
+
+ @ApiModelProperty(value = "1-付费商品 2-积分商品")
+ private Integer goodsType;
+
+ @ApiModelProperty(hidden = true)
+ private Long memberId;
}
--
Gitblit v1.9.1