Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test

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

@@ -54,9 +54,8 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     @Override
     public List<SettlementOwner> getMergeSettlementNos(String settlementNo) {
         return super.list(lQrWrapper()
-                .eq(SettlementOwner::getSettlementNo, settlementNo)
-                .eq(SettlementOwner::getMergeStatus, SettlementOwnerEnum.MergeStatus.YES.getCode())
-                .orderByDesc(SettlementOwner::getId));
+                .eq(SettlementOwner::getSettlementSubNo, settlementNo)
+                .orderByDesc(SettlementOwner::getCreateTime));
     }
 
     @Override

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

@@ -314,7 +314,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
                 oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldOrderGoods.getResidueTransportWeight());
         oldOrderGoods.setExtractWeight(realExtractWeight);
-
         //本次提取增加或者减少的吨数  =  本次提取的吨数 - 货单原实际提取吨数
         BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
         int flag = answer.compareTo(BigDecimal.ZERO);
@@ -368,7 +367,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
         } else {
             //当编辑吨数等于0 的时候，不进行拦截
-
             orderGoodsParams.setResidueTransportWeight(oldOrderGoods.getResidueTransportWeight());
         }
 
@@ -463,7 +461,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
      * 限制货单更新剩余吨数不能小于35吨
      **/
     private void limitOrderGoodsResidueWeight(BigDecimal residueTransportWeight){
-
         if(residueTransportWeight.compareTo(BigDecimal.ZERO) != 0 &&  residueTransportWeight.compareTo(new BigDecimal("35")) < 0){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"当前货单剩余吨数不足35吨，无法挂单");
         }

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

@@ -67,12 +67,11 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java

@@ -140,7 +140,7 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
     }
 
     public static String formatPayMsg(Integer settlementStatus,String payMsg) {
-        if (!Objects.equals(settlementStatus, BreakContractSettlementDriverEnum.SettleStatus.YES.getCode())) {
+        if (!Objects.equals(settlementStatus, BreakContractSettlementDriverEnum.SettleStatus.YES.getCode()) || StringUtils.equals("success",payMsg)) {
             return null;
         }
         return payMsg;

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

@@ -71,7 +71,7 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
     }
 
     public static String formatPayMsg(Integer settlementStatus,String payMsg) {
-        if (!Objects.equals(settlementStatus, SettlementDriverEnum.Status.SETTLED.getCode())) {
+        if (!Objects.equals(settlementStatus, SettlementDriverEnum.Status.SETTLED.getCode()) || StringUtils.equals("success",payMsg)) {
             return null;
         }
         return payMsg;

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

@@ -540,13 +540,14 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             settlementOwnerDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
         }
     }
-
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void mergeOwnerSettlement(MergeOwnerSettlementParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         LocalDateTime now = LocalDateTime.now();
+        if(param.getList().size() < 2){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"请选择至少两条记录");
+        }
         //查询结算单数据
         List<SettlementOwner>  settlementOwnersList = settlementOwnerDao.listInField(SettlementOwner :: getId,param.getList());
         if(!Objects.equals(param.getList().size(),settlementOwnersList.size())){
@@ -571,7 +572,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 log.warn("货主结算单号:{}  结算单不允许二次合并",item.getSettlementNo());
                 throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,"结算单不允许二次合并");
             }
-            if(Objects.equals(SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode(),item.getStatus())){
+            if(!Objects.equals(SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode(),item.getStatus())){
                 log.warn("货主结算单号:{}  的结算状态非待对账",item.getSettlementNo());
                 throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,tip);
             }
@@ -605,6 +606,8 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             }else{
                 merge = item;
                 merge.setId(null);
+                merge.setId(null);
+                merge.setOrderNo(null);
                 merge.setSettlementNo(settlementNo);
                 merge.setSettlementSubNo(null);
                 merge.setMergedBy(loginUserInfo.getUserName());