Merge remote-tracking branch 'origin/test' 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/listener/settle/SettlementInvoiceCompanyUpdateListener.java

@@ -26,7 +26,7 @@ public class SettlementInvoiceCompanyUpdateListener {
     @Autowired
     private SettlementMqHandlerService settlementMqHandlerService;
 
-    @RabbitListener(queues = RabbitKeySettlementConstants.SETTLEMENT_RISK_PROCESS_QUEUE)
+    @RabbitListener(queues = RabbitKeySettlementConstants.SETTLEMENT_INVOICE_COMPANY_UPDATE_QUEUE)
     public void process(Message message) {
         try{
             log.info("结算-开票公司更新, message:{}", new String(message.getBody()));

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java

@@ -9,6 +9,7 @@ import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.PowerTypeEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.extranal.broker.BrokerService;
 import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.model.OrderChild;
@@ -271,7 +272,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setReceiveTare(orderChild.getUnloadTare());
         orderChildInfo.setReceiveRough(orderChild.getUnloadRough());
         orderChildInfo.setReceiveNet(orderChild.getUnloadNet());
-        orderChildInfo.setInvoiceFlag(settlementOwnerDetail.getInvoiceType());
+        orderChildInfo.setInvoiceFlag(Objects.equals(settlementOwnerDetail.getInvoiceType(),
+                SettlementOwnerEnum.InvoiceType.ONLINE.getCode())? 2 : 1);
         orderChildInfo.setInvoicePlatform(settlementOwnerDetail.getInvoicingCompanyShorterName());
         orderChildInfo.setInvoiceStatus(Objects.equals(settlementOwnerDetail.getInvoiceStatus(),
                 SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())? 1 : 0);

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

@@ -84,7 +84,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
                 .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         SettlementDriver settlementDriver = settlementDriverDao
-                .findBySettlementNo(settlementOwnerDetail.getSettlementNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                .findByChildNo(settlementOwnerDetail.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
         settlementDriverDao.updatePayStatus(settlementDriver);
 

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
@@ -770,8 +774,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         String settlementNo = settlementOwnerDetail.getSettlementNo();
         SettlementOwner settlementOwner = settlementOwnerDao
                 .findBySettlementNo(settlementNo).orElseThrow(ResultEnum.DATA_NOT_FIND);
-        SettlementDriver settlementDriver = settlementDriverDao
-                .findBySettlementNo(settlementNo).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
         settlementOwner.setWeight(BigDecimal.ZERO);
         settlementOwner.setFreight(BigDecimal.ZERO);