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

performance-web/src/main/java/com/clx/performance/controller/temp/TempSettlementController.java

@@ -107,4 +107,14 @@ public class TempSettlementController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "开票公司更新", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/updateInvoiceCompany", method = RequestMethod.GET)
+    public Result updateInvoiceCompany(Integer id) {
+
+        // 发送mq （开票公司更新）
+        settlementMqService.updateInvoiceCompany(id);
+
+        return Result.ok();
+    }
+
 }

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

@@ -19,6 +19,7 @@ import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -74,7 +75,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return update(lUdWrapper()
                 .eq(SettlementOwnerDetail::getId, item.getId())
                 .set(SettlementOwnerDetail::getInvoiceType, item.getInvoiceType())
-                .set(SettlementOwnerDetail::getInvoiceStatus, item.getInvoiceStatus())
+                .set(SettlementOwnerDetail::getInvoiceTypeStatus, item.getInvoiceTypeStatus())
                 .set(SettlementOwnerDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
                 .set(SettlementOwnerDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
                 .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
@@ -87,6 +88,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .eq(SettlementOwnerDetail::getId, item.getId())
                 .set(SettlementOwnerDetail::getInvoiceType, item.getInvoiceType())
                 .set(SettlementOwnerDetail::getInvoiceFreight, item.getInvoiceFreight())
+                .set(SettlementOwnerDetail::getInvoiceStatus, item.getInvoiceStatus())
                 .set(SettlementOwnerDetail::getSettlementFreight, item.getSettlementFreight())
                 .set(SettlementOwnerDetail::getFinalPaymentStatus, item.getFinalPaymentStatus())
                 .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())

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

@@ -908,6 +908,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
         }
 
+        if (settlementOwnerDetail.getInvoiceFreight().compareTo(BigDecimal.ZERO) <= 0) {
+            settlementOwnerDetail.setInvoiceStatus(SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
+        }
         settlementDriverDetail.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
         settlementDriverDetail.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
         settlementDriverDetail.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());

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

@@ -689,18 +689,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 networkSyncComponent.ownerSettlementSync(settlementOwner,settlementOwnerDetailList);
 
             }else{
-                if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
-                    int invoiceStatus;
-                    int detailInvoiceStatus;
-                    if(settlementOwner.getInvoiceFreight().compareTo(BigDecimal.ZERO) > 0 ){ //结算单开票金额>0结算单填写发票物流单号以后，更新状态为“是”
-                        invoiceStatus = SettlementOwnerEnum.InvoiceStatus.INVOICED.getCode();
-                        detailInvoiceStatus =  SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode();
-                    }else{  //结算单开票金额<=0的结算单，货主确认结算单后，更新状态为“无需开票”
-                        invoiceStatus = SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode();
-                        detailInvoiceStatus =  SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode();
-                    }
-                    settlementOwner.setInvoiceStatus(invoiceStatus);
-                    settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, detailInvoiceStatus);
+                // 小于0不开票
+                if(settlementOwner.getInvoiceFreight().compareTo(BigDecimal.ZERO) <= 0 ) {
+                    settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
                 }
                 settlementOwner.setStatus(SettlementOwnerEnum.Status.COMPLETED.getCode());
                 settlementOwnerDao.updateInvoiceStatusAndStatus(settlementOwner);