From c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:55:58 +0800
Subject: [PATCH] refactor(mall): 优化订单收货类型判断逻辑
---
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 25eebaa..3640115 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -18,6 +18,15 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "小店APP_ID")
+ private String storeAppId;
+
+ @ApiModelProperty(value = "小店商品ID")
+ private String storeGoodsId;
+
+ @ApiModelProperty(value = "商品主图")
+ private String thumb;
+
@ApiModelProperty(value = "商品编号")
private String goodsNo;
@@ -35,6 +44,9 @@
@ApiModelProperty(value = "原价")
private String originalPrice;
+
+ @ApiModelProperty(value = "积分价格")
+ private String staticPropPrice;
@ApiModelProperty(value = "现价")
private String presentPrice;
@@ -60,7 +72,7 @@
@ApiModelProperty(value = "运费")
private BigDecimal carriage;
- @ApiModelProperty(value = "1-普通商品 2-套餐")
+ @ApiModelProperty(value = "1-普通商品 2-套餐 3-微信小店")
private Integer isNormal;
@ApiModelProperty(value = "轮播图")
@@ -71,4 +83,38 @@
@ApiModelProperty(value = "评论数量")
private Integer commentCount;
+ //运费方式 （1：固定运费 2：运费模板）
+
+ @ApiModelProperty(value = "运费方式 （1：固定运费 2：运费模板）")
+ private Integer carriageType;
+ //运费金额
+
+ @ApiModelProperty(value = "固定运费金额")
+ private BigDecimal carriageAmount;
+ //运费模板ID
+
+ @ApiModelProperty(value = "运费模板ID")
+ private Long carriageRuleId;
+ //重量
+
+ @ApiModelProperty(value = "重量")
+ private BigDecimal goodsWeight;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "1级代理价格")
+ private BigDecimal levelOnePrice;
+
+ @ApiModelProperty(value = "2级代理价格")
+ private BigDecimal levelTwoPrice;
+
+ @ApiModelProperty(value = "3级代理价格")
+ private BigDecimal levelThreePrice;
+
+ @ApiModelProperty(value = "是否收藏")
+ private Integer hasCollect;
+
+ @ApiModelProperty(value = "商品主图")
+ private String mainImage;
}
--
Gitblit v1.9.1