Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

sen

2025-09-10 9578ae952527cdafc64d642f5183aa60ef92b7f2

 quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java

@@ -3,12 +3,17 @@
import cn.hutool.core.collection.CollectionUtil;
import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.cwgl.domain.EstimatedReceivable;
import com.ruoyi.cwgl.domain.PendingSettlementBusiness;
import com.ruoyi.cwgl.domain.ReceivableLineTruckPriceRule;
import com.ruoyi.cwgl.mapper.SmartLockerApplicationMapper;
import com.ruoyi.cwgl.service.IEstimatedReceivableService;
import com.ruoyi.cwgl.service.IPendingSettlementBusinessService;
import com.ruoyi.cwgl.service.ISmartLockerApplicationService;
import com.ruoyi.cwgl.service.impl.ExactPricingRuleMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -26,11 +31,13 @@
@Component("settlementTask")
public class SettlementTask
{

    private static Logger logger = LoggerFactory.getLogger(SettlementTask.class);
    @Autowired
    private IPendingSettlementBusinessService pendingSettlementBusinessService;
    @Autowired
    private IEstimatedReceivableService estimatedReceivableService;
    @Autowired
    private ISmartLockerApplicationService smartLockerApplicationService;

    public void insertPendingSettlement()
    {
@@ -96,8 +103,18 @@
            estimatedReceivableService.insertEstimatedReceivableBatch(estimatedReceivables);
        }
        pendingSettlementBusinessService.insertPendingSettlement(pendingSettlementBusinesses);
    }

        //更新同步状态用
        Integer[] ids = pendingSettlementBusinesses.stream().map(PendingSettlementBusiness::getServiceId).toArray(Integer[]::new);
        int i = pendingSettlementBusinessService.updeteCwData(ids);
        if (i>0){
            logger.info("同步状态更新成功");
        }

    }
    public void checkExpiredApplications() {
        smartLockerApplicationService.updateExpiredStatus();
    }


}