Merge branch 'refs/heads/v20.9_settlement_20240805' 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/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/settle/SettlementMqHandlerServiceImpl.java

@@ -313,9 +313,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
                 return;
             }
-
             // 同步失败
-            if (Objects.equals(result.getSyncStatus(), 2)) {
+            else if (Objects.equals(result.getSyncStatus(), 2)) {
 
                 // 更新状态
                 settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
@@ -332,14 +331,17 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
                 settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
                 settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
-            }
 
-            // 更新状态
-            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.SUCCESS.getCode());
-            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+                return;
+            }
+            else {
+                // 更新状态
+                settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.SUCCESS.getCode());
+                settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            // 发送mq （结算）
-            settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
+                // 发送mq （结算）
+                settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
+            }
         }catch (Exception e){
             log.info("结算获取状态失败， 运单号 {}",mq.getChildNo(),e);
         }

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)