From 7b393e2523307f42e57fef5cef801d1f2286b92a Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Fri, 26 Apr 2024 18:54:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/client/ClientUpdateVO.java      |  2 +-
 .../vo/priceproduct/ProductSimpleVO.java      |  3 +++
 .../mapper/RecycleStationPriceMapper.xml      | 22 +++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java
index 7f00d67..fe7fdc9 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientUpdateVO.java
@@ -39,7 +39,7 @@ public class ClientUpdateVO {
     private Integer gender;
 
     @ApiModelProperty(value = "生日", required = false, example = "2024-02-28 00:00:00")
-    @Past(message = "生日范围不正确，生日必须是今天以前的")
+//    @Past(message = "生日范围不正确，生日必须是今天以前的")
     private LocalDateTime birthday;
 
     @ApiModelProperty(value = "发票抬头", required = false, example = "中铁建工集团有限公司")
diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java
index c78e3eb..0a89910 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/priceproduct/ProductSimpleVO.java
@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class ProductSimpleVO {
 
+    @ApiModelProperty("废品id")
+    private String id;
+
     @ApiModelProperty("废品编码")
     private String code;
 
diff --git a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml
index 060277b..7a09754 100644
--- a/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml
+++ b/nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml
@@ -23,23 +23,23 @@
     </select>
 
     <select id="getStationInfoByStationId" resultType="cc.yunxi.domain.vo.priceproduct.ProductRespVO">
-        select id,name,photo,parent_id, 0 recovery_price from nx_product as f where exists(
-              select e.parent_id
-              from nx_enterprise_recycle_station as a
-                       left join nx_price_recycle as b on a.id=b.recycle_id
-                       left join nx_price_product as c on b.price_id= c.price_id
-                       left join nx_price as d on d.id=b.price_id
-                       left join nx_product as e on e.id=c.product_id
-              where a.id=#{stationId} and e.parent_id=f.id
-          )
+        select distinct id,name,photo,parent_id, 0 recovery_price from nx_product as f where exists(
+             select e.parent_id
+             from nx_enterprise_recycle_station as a
+                      left join nx_price_recycle as b on a.id=b.recycle_id
+                      left join nx_price_product as c on b.price_id= c.price_id
+                      left join nx_price as d on d.id=b.price_id
+                      left join nx_product as e on e.id=c.product_id
+             where a.id=#{stationId} and e.parent_id=f.id
+         )
         union all
-        select e.id,e.name,e.photo,e.parent_id, c.recovery_price
+        select distinct e.id,e.name,e.photo,e.parent_id, c.recovery_price
         from nx_enterprise_recycle_station as a
                  left join nx_price_recycle as b on a.id=b.recycle_id
                  left join nx_price_product as c on b.price_id= c.price_id
                  left join nx_price as d on d.id=b.price_id
                  left join nx_product as e on e.id=c.product_id
-        where a.id=#{stationId}
+        where a.id=#{stationId} and isnull(e.parent_id)=false
     </select>
 
     <select id="getStationInfoFirstByStationId" resultType="cc.yunxi.domain.vo.priceproduct.ProductRespVO">