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

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPagePendingSettlementOwnerDetailVO.java

@@ -22,4 +22,7 @@ public class CarrierPagePendingSettlementOwnerDetailVO extends CarrierPageSettle
 
     @ApiModelProperty(value = "操作时间")
     private String invoicingCompanyModifiedTime;
+
+    @ApiModelProperty(value = "开票标识修改时间")
+    private String invoiceTypeModifiedTime;
 }

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

@@ -32,7 +32,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     public boolean updateStatus(SettlementOwner item) {
         return update(lUdWrapper()
                 .eq(SettlementOwner::getId, item.getId())
-                .eq(SettlementOwner::getStatus, item.getStatus())
+                .set(SettlementOwner::getStatus, item.getStatus())
         );
     }
 
@@ -41,7 +41,10 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         return update(lUdWrapper()
                 .eq(SettlementOwner::getId, item.getId())
                 .set(SettlementOwner::getWeight, item.getWeight())
+                .set(SettlementOwner::getLoadNet, item.getLoadNet())
+                .set(SettlementOwner::getUnloadNet, item.getUnloadNet())
                 .set(SettlementOwner::getFreight, item.getFreight())
+                .set(SettlementOwner::getDriverFreight, item.getDriverFreight())
                 .set(SettlementOwner::getLossWeight, item.getLossWeight())
                 .set(SettlementOwner::getLossFreight, item.getLossFreight())
                 .set(SettlementOwner::getSettlementFreight, item.getSettlementFreight())

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -223,23 +223,7 @@ public class OrderChildSyncTransportListener {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
-            // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
-            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
-                    settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
-            //设置开票公司信息
-            settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
-            settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
-            settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
-
-            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
-            if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
-                settlementOwnerDetail.setInvoiceServiceFeeRate(
-                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
-            }
 
-            settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
-            settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
-            settlementDriverDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
         } else {
             if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -77,6 +77,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private String invoicingCompanyModifiedBy;                  //开票公司修改人
     private LocalDateTime invoicingCompanyModifiedTime;                  //开票公司修改时间
     private String separateRemark;                       //拆单备注
+    private LocalDateTime invoiceTypeModifiedTime;                  //开票标识修改时间
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -272,7 +272,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setReceiveTare(orderChild.getUnloadTare());
         orderChildInfo.setReceiveRough(orderChild.getUnloadRough());
         orderChildInfo.setReceiveNet(orderChild.getUnloadNet());
-        orderChildInfo.setInvoiceFlag(Objects.equals(settlementOwnerDetail.getInvoiceType(),
+        orderChildInfo.setInvoiceFlag(settlementOwnerDetail.getInvoiceType()==null? null
+                :Objects.equals(settlementOwnerDetail.getInvoiceType(),
                 SettlementOwnerEnum.InvoiceType.ONLINE.getCode())? 2 : 1);
         orderChildInfo.setInvoicePlatform(settlementOwnerDetail.getInvoicingCompanyShorterName());
         orderChildInfo.setInvoiceStatus(Objects.equals(settlementOwnerDetail.getInvoiceStatus(),

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

@@ -719,6 +719,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setReportFlag(orderInfo.getReportFlag());
         // 开票服务费
         settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());
+
+        settlementOwner.setDriverFreight(settlementOwnerDetail.getDriverFreight());
+        settlementOwner.setLoadNet(settlementOwnerDetail.getLoadNet());
+        settlementOwner.setUnloadNet(settlementOwnerDetail.getUnloadNet());
+
         settlementOwnerDao.saveEntity(settlementOwner);
 
         //保存结算单日志----创建结算单

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

@@ -56,6 +56,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.clx.performance.enums.PerformanceResultEnum.DATA_NOT_FIND;
@@ -169,6 +170,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         return settlementOwnerDetail.getId();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateInvoiceCompany(CarrierSettlementOwnerDetailCompanyUpdateParam param) {
 

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

@@ -728,7 +728,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             settlementOwnerDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerEnum.InvoiceStatus.INVOICED.getCode());
         } else {
             log.info("当前是结算单部分开票");
-            settlementOwnerDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
+            settlementOwnerDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerEnum.InvoiceStatus.PART_INVOICE.getCode());
         }
     }
     @Transactional(rollbackFor = Exception.class)