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

wujianwei

2025-09-10 32337b3f584a5b95af114697178251b51ecc14fd

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

@@ -7,8 +7,10 @@
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;
@@ -34,6 +36,8 @@
    private IPendingSettlementBusinessService pendingSettlementBusinessService;
    @Autowired
    private IEstimatedReceivableService estimatedReceivableService;
    @Autowired
    private ISmartLockerApplicationService smartLockerApplicationService;

    public void insertPendingSettlement()
    {
@@ -108,7 +112,9 @@
        }

    }

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


}