lubo месяцев назад: 3
Родитель
Сommit
8ab599cc01

+ 7 - 0
ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidySharedPoolServiceImpl.java

@@ -246,10 +246,17 @@ public class SubsidySharedPoolServiceImpl implements ISubsidySharedPoolService {
     public SubsidySharedPool settlement(Long sharedId, SharedSettlementMode sharedSettlementMode) {
         log.info("开始执行均摊池到期结算");
         SubsidySharedPool subsidySharedPool = loadById(sharedId, false);
+        if(ObjectUtil.isNull(subsidySharedPool))
+        {
+            log.info("商户当前均摊池不存在");
+            return null;
+        }
         if(subsidySharedPool.getSettlemented())
         {
+            log.info("商户当前均摊池已结算");
             return null;
         }
+
         if(subsidySharedPool.getTotalSharedAmount().compareTo(BigDecimal.ZERO)<=0)
         {
             log.info("商户当前均摊池为{},无法结算", subsidySharedPool.getTotalSharedAmount());