From 4c8ad371d7a5eac9227d487341c56c4dab264d7b Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 15:16:23 +0800
Subject: [PATCH] 还款提醒，纠正提醒的判断，添加修改单价时，重新验证还款提醒。
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java | 11 ++++-------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java | 7 ++++---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | 4 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java | 12 ++++++++++--
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
index 3497ad2..fdb60e4 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
@@ -2,15 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.mapper.FoodPriceMapper;
+import com.fzzy.igds.timer.JobWarnService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -19,11 +20,15 @@
* @Author CZT
* @Date 2026/01/22 09:04
*/
+@Slf4j
@Service
public class FoodPriceService {
@Resource
private FoodPriceMapper foodPriceMapper;
+
+ @Resource
+ private JobWarnService jobWarnService;
/**
*
@@ -81,6 +86,9 @@
foodPriceMapper.insert( data);
}else {
foodPriceMapper.updateById( data);
+ //鏇存柊鏃讹紝鎵ц杩樻鎻愰啋閲嶆柊鍒ゆ柇
+ log.info("---------绮鍗曚环鏇存柊鏃讹紝鎵ц杩樻鎻愰啋閲嶆柊鍒ゆ柇鍗曚环id{}---------",data.getId());
+ jobWarnService.doExe(data.getBankId());
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
index 5ee2e2d..350b2a6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
@@ -4,11 +4,9 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.mapper.PledgeContractMapper;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -109,7 +107,7 @@
* @param curTime
* @return
*/
- public List<PledgeContract> getContractByPledge(Date curTime) {
+ public List<PledgeContract> getContractByPledge(Date curTime, String bankId) {
QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", ContextUtil.getCompanyId());
@@ -119,6 +117,9 @@
//璐ㄦ娂鏈熼棿
queryWrapper.le("pledge_start", curTime);
queryWrapper.ge("pledge_end", curTime);
+ if (StringUtils.isNotBlank(bankId)) {
+ queryWrapper.eq("pledge_bank", bankId);
+ }
queryWrapper.orderByDesc("update_time");
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 eee699e..849c201 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
@@ -26,7 +26,6 @@
* @Date 2026/1/23 9:14
*/
@Slf4j
-
@Service
public class JobWarnService {
@@ -44,20 +43,18 @@
*/
@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;
@@ -117,7 +114,7 @@
per = sumMoney / backMoney;
- if (per > 1.1) {
+ if (per < 1.1) {
log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑110%锛宻umMoney={}锛宐ackMoney={}锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
continue;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
index 59d0e85..cc357fe 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -6,9 +6,9 @@
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkNode;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
@@ -193,7 +193,7 @@
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
- work.setDescription("褰撳墠鍚堝悓<" + data.getName() + ">涓嬭川鎶间粨搴�<" + data.getDepotNames() + ">搴撳瓨閲忛噾棰濅綆浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆撅紒");
+ work.setDescription("褰撳墠鍚堝悓<" + data.getName() + ">涓嬭川鎶间粨搴�<" + data.getDepotNames() + ">搴撳瓨閲忛噾棰濋珮浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆撅紒");
work.setCreateBy("绯荤粺鐢熸垚");
work.setCreateById("sys");
--
Gitblit v1.9.3