Merge branch 'refs/heads/v20.9_settlement_20240805' into test

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

@@ -46,6 +46,14 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper,
                 .map(super::getOne);
     }
 
+    @Override
+    public Optional<SettlementDriver> findByChildNo(String childNo) {
+        return Optional.of(lQrWrapper()
+                        .eq(SettlementDriver::getChildNo, childNo)
+                )
+                .map(super::getOne);
+    }
+
     @Override
     public IPage<SettlementDriver> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
         LambdaQueryWrapper<SettlementDriver> query = new LambdaQueryWrapper<>();

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

@@ -3,14 +3,11 @@ package com.clx.performance.dao.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementDriverMapper;
 import com.clx.performance.model.settle.SettlementDriver;
-import com.clx.performance.model.settle.SettlementOwner;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Author: aiqinguo
@@ -25,6 +22,7 @@ public interface SettlementDriverDao extends BaseDao<SettlementDriverMapper, Set
 
     Optional<SettlementDriver> findBySettlementNo(String settlementNo);
 
+    Optional<SettlementDriver> findByChildNo(String childNo);
 
     IPage<SettlementDriver> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param);
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -526,7 +526,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     }
 
     private void settlementDriverSave(SettlementDriverDetail detail,String settlementNo){
-        SettlementDriver settlementDriver = new SettlementDriver();
+        SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(detail.getChildNo()).orElse(new SettlementDriver());
         settlementDriver.setDriverUserNo(detail.getDriverUserNo());
         settlementDriver.setDriverName(detail.getDriverName());
         settlementDriver.setSettlementNo(settlementNo);
@@ -558,7 +558,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriver.setPlatformServiceFeeRate(detail.getPlatformServiceFeeRate());
         settlementDriver.setPlatformServiceFee(detail.getPlatformServiceFee());
 
-        settlementDriverDao.saveEntity(settlementDriver);
+        if (settlementDriver.getId() == null) {
+            settlementDriverDao.saveEntity(settlementDriver);
+        }else {
+            settlementDriverDao.updateEntityByKey(settlementDriver);
+        }
     }
 
     @Override