质押还款提醒，库区错误提醒修复

sgj

2026-03-30 53024ef844835199ab74dbb27bfa10a290c96443

 fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java

@@ -2,11 +2,15 @@

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PledgeReminders;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.domain.PledgeContractDepot;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.FoodPriceService;
import com.fzzy.igds.service.PledgeContractDepotService;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.domain.WorkOrderConf;
@@ -17,8 +21,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * @Description 警告信息定时统计：还款提醒
@@ -31,12 +34,17 @@

    @Resource
    private PledgeContractService contractService;

    @Resource
    private PledgeContractDepotService pledgeContractDepotService;

    @Resource
    private DepotService depotService;
    @Resource
    private FoodPriceService foodPriceService;
    @Resource
    private BizWorkService workService;


    /**
     * 每天两点执行：还款提醒
@@ -57,12 +65,21 @@
        }
        Depot depot;
        FoodPrice foodPrice;
        WorkOrderConf conf;
        WorkOrderConf conf = null;

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

            Map<String, PledgeReminders> remindersMap = new HashMap<>();

            //获取质押仓库信息
            IgdsBaseParam igdsBaseParam = new IgdsBaseParam();
            igdsBaseParam.setParentId(pledgeContract.getId());
            List<PledgeContractDepot> pledgeContractDepots = pledgeContractDepotService.listAll(igdsBaseParam);

            //计算待还款金额
            backMoney = pledgeContract.getContractAmount() - pledgeContract.getRepaidAmount();
@@ -78,20 +95,18 @@
                continue;
            }

            if (StringUtils.isBlank(pledgeContract.getDepotIds())) {
            if (pledgeContractDepots.isEmpty()) {
                //若质押仓库为空，则跳过当前合同
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getName());
                continue;
            }

            String[] depotIds = pledgeContract.getDepotIds().split(",");
            if (depotIds.length < 1) {
                //若质押仓库为空，则跳过当前合同
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getName());
                continue;
            }
            sumMoney = 0.0;
            for (String depotId : depotIds) {
            //获取质押库区
            List<String> deptIds = new ArrayList<>();
            for (PledgeContractDepot pledgeContractDepot : pledgeContractDepots) {
                String depotId = pledgeContractDepot.getPledgeDepot();
                deptIds.add(pledgeContractDepot.getPledgeDept());
                //查询仓库信息
                depot = depotService.getCacheDepot(pledgeContract.getCompanyId(), depotId);
                if (null == depot) {
@@ -109,25 +124,46 @@
                }

                sumMoney += depot.getStorageReal() * foodPrice.getPrice();
                //按品种+单价生成key，来作为唯一标识，统计粮食品种的库存量以及粮食品种信息
                String key = depot.getFoodVariety() + foodPrice.getPrice();
                PledgeReminders pledgeReminders = remindersMap.get(key);
                if (null == pledgeReminders) {
                    pledgeReminders = new PledgeReminders();
                    pledgeReminders.setFoodVariety(depot.getFoodVariety());
                    pledgeReminders.setFoodVarietyName(depot.getFoodVarietyName());
                    pledgeReminders.setFoodPrice(foodPrice.getPrice());
                    pledgeReminders.setStorageReal(pledgeReminders.getStorageReal() + depot.getStorageReal());

                } else {
                    pledgeReminders.setStorageReal(pledgeReminders.getStorageReal() + depot.getStorageReal());
                }
                remindersMap.put(key, pledgeReminders);
                log.info("-----当前合同={}下仓库={}：对应的实际储量={}，对应粮食单价={}-----", pledgeContract.getName(), depot.getName(), depot.getStorageReal(), foodPrice.getPrice());
            }

            per = sumMoney / backMoney;

            if (per < 1.1) {
            if (per > 1.1) {
                //货可以抵贷款
                log.error("-----当前合同={}下质押仓库={}库存未到待还款的110%，sumMoney={}，backMoney={}，不生成还款提醒工单-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
                continue;
            }
            //货不足以抵贷款 ,提醒企业补钱

            //执行流程
            conf = workService.getConfByDeptId(pledgeContract.getPledgeDept(), WorkBizType.TYPE_50);
            //根据质押仓库的库区，找到其中一个库区配置的提醒工单流程
            for (String deptId : deptIds){
                conf = workService.getConfByDeptId(deptId, WorkBizType.TYPE_50);
                if(null!=conf && Constant.YN_Y.equals(conf.getValTag())){
                    break;
                }
            }
            //流程不启用
            if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
                log.error("-----当前合同={}质押库区={}未配置还款提醒审批流程，无法生成工单提醒-----", pledgeContract.getName(), pledgeContract.getPledgeDept());
                continue;
            }

            BaseResp resp = workService.startByBackMoney(pledgeContract, conf);
            BaseResp resp = workService.startByBackMoney(pledgeContract, conf, remindersMap);
            log.info("---------当前合同={}启动还款提醒工单流程------{}", pledgeContract.getName(), resp);
        }
    }