From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 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..cac256b 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-套餐 3-微信小店", example = "2")
+    private Integer isNormal;
+
+    @ApiModelProperty(value = "1-付费商品 2-积分商品")
+    private Integer goodsType;
+
+    @ApiModelProperty(hidden = true)
+    private Long memberId;
 }

--
Gitblit v1.9.1