From 7587cf1df12555ec99031103e0c6d26c23d5fd64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 15 Nov 2025 10:48:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=9B=B4=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=92=8C=E8=AE=A2=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5-=20=E5=9C=A8=20ShopGoods=20=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20marketPrice=20=E5=AD=97=E6=AE=B5-?=
 =?UTF-8?q?=20=E5=9C=A8=20ShopOrder=20=E5=92=8C=20ShopOrderParam=20?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20expressNo=20=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20ShopDealerRefereeMapper.xml=20?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=20SQL?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=20SELECT=20DISTINCT=20=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java         | 3 +++
 src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java         | 3 +++
 .../com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml  | 2 +-
 src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java     | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java
index 0e2935d..3d03203 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java
@@ -70,6 +70,9 @@ public class ShopGoods implements Serializable {
     @Schema(description = "经销商价格")
     private BigDecimal dealerPrice;
 
+    @Schema(description = "市场价")
+    private BigDecimal salePrice;
+
     @Schema(description = "佣金")
     private BigDecimal commission;
 
diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
index 3a32938..0e7ed6b 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
@@ -169,6 +169,9 @@ public class ShopOrder implements Serializable {
     @Schema(description = "发货备注")
     private String deliveryNote;
 
+    @Schema(description = "快递单号")
+    private String expressNo;
+
     @Schema(description = "发货时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime deliveryTime;
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
index 881e662..adb9991 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,
+        SELECT DISTINCT a.*,
                d.nickname AS dealerName,
                d.avatar AS dealerAvatar,
                d.phone AS dealerPhone,
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
index 83178cb..2fd9182 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
@@ -175,6 +175,9 @@ public class ShopOrderParam extends BaseParam {
     @Schema(description = "发货备注")
     private String deliveryNote;
 
+    @Schema(description = "快递单号")
+    private String expressNo;
+
     @Schema(description = "发货时间")
     private String deliveryTime;