还款提醒，纠正提醒的判断，添加修改单价时，重新验证还款提醒。

sgj

2026-03-10 4c8ad371d7a5eac9227d487341c56c4dab264d7b

还款提醒，纠正提醒的判断，添加修改单价时，重新验证还款提醒。

 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());
        }
    }


 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");


 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%，sumMoney={}，backMoney={}，不生成还款提醒工单-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
                continue;
            }

 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");