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