货主还款，更新车主计费明细

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanAccountRunningWaterRecordDaoImpl.java

@@ -111,6 +111,13 @@ public class OwnerLoanAccountRunningWaterRecordDaoImpl extends BaseDaoImpl<Owner
                         OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode())
         );    }
 
+    @Override
+    public List<OwnerLoanAccountRunningWaterRecord> selectLoanRunningWatterRecord(Long loanNo, Integer runningWaterType) {
+        return baseMapper.selectList(lQrWrapper().eq(OwnerLoanAccountRunningWaterRecord::getLoanNo, loanNo)
+                .eq(OwnerLoanAccountRunningWaterRecord::getRunningWaterType, runningWaterType
+                        )
+        );    }
+
     @Override
     public List<OwnerLoanAccountRunningWaterRecord> getListByChildNoAndRunningWaterType(List<String> childNoList, Integer runningWaterType) {
         return baseMapper.selectList(lQrWrapper().in(OwnerLoanAccountRunningWaterRecord::getChildNo, childNoList)

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -115,4 +115,9 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
         );
     }
 
+    @Override
+    public List<SettlementDriverDetail> selectListByLoanFlag(Integer code) {
+        return baseMapper.selectList(lQrWrapper().eq(SettlementDriverDetail::getLoanFlag, code));
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/loan/OwnerLoanAccountRunningWaterRecordDao.java

@@ -31,6 +31,8 @@ public interface OwnerLoanAccountRunningWaterRecordDao extends BaseDao<OwnerLoan
 
     List<OwnerLoanAccountRunningWaterRecord> selectLoanRunningWatterRecord(Long loanNo);
 
+    List<OwnerLoanAccountRunningWaterRecord> selectLoanRunningWatterRecord(Long loanNo, Integer runningWaterType);
+
     List<OwnerLoanAccountRunningWaterRecord> getListByChildNoAndRunningWaterType(List<String> childNoList, Integer runningWaterType);
 
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

@@ -37,4 +37,6 @@ public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetai
     SettlementDriverDetail selectLoanFlag(String orderNo);
 
     SettlementDriverDetail selectLoanTypeFlag(String orderNo);
+
+    List<SettlementDriverDetail> selectListByLoanFlag(Integer code);
 }

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -7,23 +7,24 @@ import com.clx.performance.component.OrderChildLoanComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.loan.OrderChildLoanRetryRecordDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountRunningWaterRecordDao;
+import com.clx.performance.dao.loan.OwnerLoanRecordDao;
 import com.clx.performance.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.OwnerLoanMqDTO;
-import com.clx.performance.enums.loan.BankTradeEnum;
 import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.loan.OrderChildLoanRetryRecord;
-import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.model.loan.OwnerLoanAccountRunningWaterRecord;
+import com.clx.performance.model.loan.OwnerLoanRecord;
 import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.settle.SettlementMqService;
+import com.msl.common.base.Optional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -33,12 +34,13 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Component
@@ -66,9 +68,11 @@ public class EventListenerComponent {
 
     private final RabbitTemplate rabbitTemplate;
 
+    private final OwnerLoanRecordDao ownerLoanRecordDao;
+
 
     @Async
-    @TransactionalEventListener(classes = {SettlementUpdateEvent.class},phase = TransactionPhase.AFTER_ROLLBACK,fallbackExecution = true)
+    @TransactionalEventListener(classes = {SettlementUpdateEvent.class}, phase = TransactionPhase.AFTER_ROLLBACK, fallbackExecution = true)
     public void listen(SettlementUpdateEvent event) {
         log.info("SettlementUpdateEvent事件执行");
         SettlementOwnerDetail settlementOwnerDetail = event.getSettlementOwnerDetail();
@@ -101,7 +105,7 @@ public class EventListenerComponent {
     }
 
     @Async
-    @TransactionalEventListener(classes = {OwnerLoanEvent.class},phase = TransactionPhase.AFTER_COMMIT,fallbackExecution = true)
+    @TransactionalEventListener(classes = {OwnerLoanEvent.class}, phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true)
     public void listen(OwnerLoanEvent event) {
         log.info("OwnerLoanEvent事件执行");
         OwnerLoanMqDTO param = event.getParam();
@@ -132,23 +136,43 @@ public class EventListenerComponent {
     public void listen(OwnerLoanFlagEvent event) {
         log.info("OwnerLoanFlagEvent事件执行");
         Long loanNo = event.getLoanNo();
-        List<OwnerLoanAccountRunningWaterRecord> records = ownerLoanAccountRunningWaterRecordDao.selectLoanRunningWatterRecord(loanNo);
-        if (CollectionUtil.isEmpty(records)) {
-            return;
-        }
+        List<OwnerLoanAccountRunningWaterRecord> records = ownerLoanAccountRunningWaterRecordDao.selectLoanRunningWatterRecord
+                (loanNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_CHILD_WRITE_OFF.getCode());
 
         Map<String, List<OwnerLoanAccountRunningWaterRecord>> listMap = records.stream().collect(Collectors.groupingBy(OwnerLoanAccountRunningWaterRecord::getChildNo));
-
         List<String> childNoList = new LinkedList<>();
         for (Map.Entry<String, List<OwnerLoanAccountRunningWaterRecord>> entry : listMap.entrySet()) {
             if (entry.getValue().size() == 1) {
                 childNoList.add(entry.getKey());
             } else {
-                log.info("当前运单:{} 存在多条运单流水记录,无法更新运单的贷款标识",entry.getKey());
+                boolean flag = true;
+                for (OwnerLoanAccountRunningWaterRecord record : entry.getValue()) {
+                    if (record.getLoanNo().equals(loanNo)) {
+                        continue;
+                    }
+
+                    Optional<OwnerRepayment> optional = ownerRepaymentDao.getOneByField(OwnerRepayment::getLoanNo, record.getLoanNo());
+                    if (!optional.isPresent()) {
+                        //没有还款记录
+                        flag = false;
+                        break;
+                    } else {
+                        OwnerRepayment ownerRepayment = optional.get();
+                        //其他流水记录对应的还款单不是付款成功
+                        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAY_SUCCESS.getCode())) {
+                            log.info("当前运单号{},对应多条流水,其中流水号：{},对应的还款单号{},未还款", entry.getKey(), record.getRunningWaterNo(), ownerRepayment.getRepaymentNo());
+                            flag = false;
+                            break;
+                        }
+                    }
+                }
+                if (flag) {
+                    childNoList.add(entry.getKey());
+                }
             }
         }
-        log.info("当前需要更新的运单数量:{}", listMap.size());
 
+        log.info("需要更新计费明细借款标识为已还款的运单号：{}", JSONUtil.parse(childNoList));
         if (CollectionUtil.isNotEmpty(childNoList)) {
             settlementDriverDetailDao.updateLoanFlagByChildNoList(childNoList);
             settlementDriverDao.updateLoanFlagByChildNoList(childNoList);