feat(shop): 更新商品和订单实体字段- 在 ShopGoods 实体中添加 marketPrice 字段- 在 ShopOrder 和 ShopOrderParam 中添加 expressNo 字段

- 修改 ShopDealerRefereeMapper.xml 中的关联查询 SQL，使用 SELECT DISTINCT 避免重复数据

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;
 

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;

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,

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;