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/MallGoodsUpdateDto.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
index 3917bc0..36f5e4b 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
@@ -4,11 +4,16 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@ApiModel(value = "MallGoodsUpdateDto", description = "参数接收类")
public class MallGoodsUpdateDto {
+
+ private String storeAppId;
+
+ private String storeGoodsId;
private Long id;
@@ -19,6 +24,8 @@
private List<MailGoodsSkuDto> mailGoodsSkuDto;
private String thumbs;
+
+ private String goodsParameter;
private String goodsIntrodution;
@@ -37,4 +44,65 @@
private Long categoryId;
private Integer isHot;
+
+ /**
+ * 库存
+ */
+ private Integer stock;
+
+ /**
+ * 销量
+ */
+ private Integer volume;
+
+ /**
+ * 成本价
+ */
+ private BigDecimal costPrice;
+
+
+ /**
+ * 静态倍数
+ */
+ private BigDecimal staticMulti;
+
+ /**
+ * 静态占比
+ */
+ private BigDecimal staticProp;
+
+ /**
+ * 是否多规则 1-是 2-否
+ */
+ private Integer isSku;
+
+ /**
+ * 是否普通商品 1-普通商品 2-套餐
+ */
+ private Integer isNormal;
+
+ private BigDecimal score;
+
+ private Integer goodsType;
+
+ private List<Long> delSkuId;
+
+ private Integer hasCarriage;
+
+ private BigDecimal carriage;
+ //运费方式 （1：固定运费 2：运费模板）
+ private Integer carriageType;
+ //运费金额
+ private BigDecimal carriageAmount;
+ //运费模板ID
+ private Long carriageRuleId;
+ //重量
+ private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
+ private BigDecimal levelOnePrice;
+ private BigDecimal levelTwoPrice;
+ private BigDecimal levelThreePrice;
+
+ private List<Long> couponIds;
}
--
Gitblit v1.9.1