From 66f343db8fd018ce82cad4b55fe6f93312758eef Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 14 May 2025 10:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E7=AB=9E=E4=BB=B7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             |  3 +-
 .../portal/api/sysnotice/SysNoticeVo.java     |  2 ++
 .../LoanSecondarySalesApplyDetailsVo.java     |  2 ++
 .../LoanSecondarySalesApplyService.java       | 29 +++++++++++++++++--
 .../LoanSecondarySalesBiddingMapper.java      |  2 ++
 .../LoanSecondarySalesBiddingMapper.xml       |  5 ++++
 .../LoanSecondarySalesBiddingService.java     |  4 +++
 7 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index c9242b6525..9a5920f6ce 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1189,7 +1189,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     Future future10 = pool.submit(() -> {
                         pushOtherDocument(busDeliveredApply, detailsList);
                     });
-                    /*Future future13 = pool.submit(() -> {
+                   /* Future future13 = pool.submit(() -> {
+                        //推送车辆利润报表
                         pushCarSoldProfit(busDeliveredApply, detailsList);
                     });*/
                     //推送单车返利管理
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java
index 605db06062..b5f2c20793 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java
@@ -21,4 +21,6 @@ public class SysNoticeVo {
     private String stateValue;
     @ApiModelProperty("是否置顶")
     private String topping;
+    @ApiModelProperty("PC端页面地址")
+    private String pcUrl;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
index 0b37dcee44..d1a710a8d2 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
@@ -100,5 +100,7 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("是否显示竞价按钮")
     private boolean validate;
 
+    private String result;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
index a239c24489..f3dee134a9 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
@@ -24,8 +24,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.portal.api.sysnotice.PushNoticeQuery;
-import com.yxt.anrui.portal.api.sysnotice.SysNoticeFeign;
+import com.yxt.anrui.portal.api.sysnotice.*;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -46,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTr
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
@@ -86,6 +86,9 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -1194,6 +1197,28 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 }
             }
 
+            //查询竞价结果
+            SysNoticeDetailsVo sysNotice = sysNoticeFeign.getDetails(sid).getData();
+            if(sysNotice != null){
+                //查询截止日期，是否小于或等于当前日期
+                String validityDate = sysNotice.getValidityDate();
+                // 解析截止日期（假设格式为 yyyy-MM-dd）
+                LocalDate noticeExpiryDate = LocalDate.parse(validityDate);
+                LocalDate currentDate = LocalDate.now();
+
+                // 判断是否已过期（截止日期 <= 当前日期）
+                if (noticeExpiryDate.isBefore(currentDate) || noticeExpiryDate.isEqual(currentDate)) {
+                    LoanSecondarySalesBidding loanSecondarySalesBidding = loanSecondarySalesBiddingService.selectByMainSid(sid);
+                    Date createTime = loanSecondarySalesBidding.getCreateTime();
+                    LocalDate localDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                    String formattedDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                    String result = loanSecondarySalesBidding.getCreateByName()+formattedDate+loanSecondarySalesBidding.getPrice();
+                    loanSecondarySalesApplyDetailsVo.setResult(result);
+                }
+
+
+            }
+
         }
         return rb.success().setData(loanSecondarySalesApplyDetailsVo);
     }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java
index 2b19c94223..eba5ab8a32 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java
@@ -23,4 +23,6 @@ public interface LoanSecondarySalesBiddingMapper extends BaseMapper<LoanSecondar
     String getPrice(String sid);
 
     String getVinNo(String sid);
+
+    LoanSecondarySalesBidding selectBySidSort(String sid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml
index 381b79e4ec..6484e8632b 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml
@@ -33,4 +33,9 @@
                             group by lv.mainSid) ss on ss.mainSid = la.sid
         where la.sid = #{sid}
     </select>
+
+    <select id="selectBySidSort"
+            resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding">
+        select * from loan_secondary_sales_bidding where mainSid = #{sid} order by id desc limit 1
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java
index 802eca0e2d..a521d33754 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java
@@ -128,4 +128,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         }
         return rb.success().setData(salesBiddingVo);
     }
+
+    public LoanSecondarySalesBidding selectByMainSid(String sid) {
+        return baseMapper.selectBySidSort(sid);
+    }
 }