Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java

@@ -85,4 +85,6 @@ public class SecondarySalesAppVo {
 
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("竞价结果")
+    private String result;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -1286,6 +1286,24 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             }
         }
         secondarySalesAppVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
+        //查询竞价结果
+        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()+"元";
+                secondarySalesAppVo.setResult(result);
+            }
+        }
         return rb.success().setData(secondarySalesAppVo);
     }
 }