修改结算单相关问题

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/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

@@ -545,6 +545,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     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())){
@@ -569,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);
             }
@@ -603,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());