From 533c9a4e44b06c90df7434a38e0da26e10cdac46 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 12 三月 2026 17:24:40 +0800
Subject: [PATCH] 质押还款提醒文案调整

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
index 85bd8f7..3ee1044 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
@@ -2,6 +2,7 @@
 
 import com.fzzy.igds.constant.Constant;
 import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.PledgeReminders;
 import com.fzzy.igds.domain.Depot;
 import com.fzzy.igds.domain.FoodPrice;
 import com.fzzy.igds.domain.PledgeContract;
@@ -17,6 +18,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -26,7 +28,6 @@
  * @Date 2026/1/23 9:14
  */
 @Slf4j
-
 @Service
 public class JobWarnService {
 
@@ -39,33 +40,35 @@
     @Resource
     private BizWorkService workService;
 
+
     /**
      * 姣忓ぉ涓ょ偣鎵ц锛氳繕娆炬彁閱�
      */
     @Scheduled(cron = "0 0 2 * * ?")
     public void timer() {
-        doExe();
+        doExe(null);
     }
 
     /**
      * 寮�濮嬭川鎶煎悎鍚屾牳绠�
      */
-    public void doExe() {
-
-        List<PledgeContract> contractList = contractService.getContractByPledge(new Date());
+    public void doExe(String bankId) {
+        List<PledgeContract> contractList = contractService.getContractByPledge(new Date(), bankId);
         if (null == contractList || contractList.isEmpty()) {
             log.error("-----褰撳墠娌℃湁鏈夋晥鏈熺殑璐ㄦ娂鍚堝悓锛屼笉鎵ц鎻愰啋鏍哥畻-----");
             return;
         }
-
         Depot depot;
         FoodPrice foodPrice;
         WorkOrderConf conf;
+
         double sumMoney = 0.0;
         double per = 0.0;
         double backMoney = 0.0;
         for (PledgeContract pledgeContract : contractList) {
             log.info("-----寮�濮嬪鐞嗚川鎶煎悎鍚岋細{}-----", pledgeContract.getName());
+            List<PledgeReminders> remindersList = new ArrayList<>();
+
 
             //璁$畻寰呰繕娆鹃噾棰�
             backMoney = pledgeContract.getContractAmount() - pledgeContract.getRepaidAmount();
@@ -112,12 +115,21 @@
                 }
 
                 sumMoney += depot.getStorageReal() * foodPrice.getPrice();
+                PledgeReminders reminders = new PledgeReminders();
+                reminders.setDepotId(depot.getId());
+                reminders.setDepotName(depot.getName());
+                reminders.setFoodVariety(depot.getFoodVariety());
+                reminders.setFoodVarietyName(depot.getFoodVarietyName());
+                reminders.setFoodPrice(foodPrice.getPrice());
+                reminders.setStorageReal(depot.getStorageReal());
+                remindersList.add(reminders);
+                log.info("-----褰撳墠鍚堝悓={}涓嬩粨搴�={}锛氬搴旂殑瀹為檯鍌ㄩ噺={}锛屽搴旂伯椋熷崟浠�={}-----", pledgeContract.getName(), depot.getName(), depot.getStorageReal(), foodPrice.getPrice());
             }
 
             per = sumMoney / backMoney;
 
-            if (per > 1.1) {
-                log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑110%锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames());
+            if (per < 1.1) {
+                log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑110%锛宻umMoney={}锛宐ackMoney={}锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
                 continue;
             }
 
@@ -129,7 +141,7 @@
                 continue;
             }
 
-            BaseResp resp = workService.startByBackMoney(pledgeContract, conf);
+            BaseResp resp = workService.startByBackMoney(pledgeContract, conf,remindersList);
             log.info("---------褰撳墠鍚堝悓={}鍚姩杩樻鎻愰啋宸ュ崟娴佺▼------{}", pledgeContract.getName(), resp);
         }
     }

--
Gitblit v1.9.3