From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑

---
 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