From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
index 5f0cb32..81a0352 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
@@ -3,11 +3,16 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@ApiModel(value = "AddMallGoodsDto", description = "参数接收类")
public class AddMallGoodsDto {
+
+ private String storeAppId;
+
+ private String storeGoodsId;
private String goodsNo;
@@ -23,6 +28,8 @@
private String thumbs;
+ private String goodsParameter;
+
private String goodsDetails;
private Integer isSale;
@@ -34,4 +41,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 Integer hasCarriage;
+
+ private BigDecimal carriage;
+ //运费方式 （1：固定运费 2：运费模板）
+ private Integer carriageType;
+ //运费金额
+ private BigDecimal carriageAmount;
+ //运费模板ID
+ private Long carriageRuleId;
+ //重量
+ private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
+ private String levelOnePrice;
+ private String levelTwoPrice;
+ private String levelThreePrice;
+
+ //优惠卷IDs
+ private List<Long> couponIds;
+
}
--
Gitblit v1.9.1