修改结算单和违约结算单已结算的数据把结算失败原因置空

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

@@ -138,4 +138,12 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
         });
 
     }
+
+    public static String formatPayMsg(Integer settlementStatus,String payMsg) {
+        if (!Objects.equals(settlementStatus, BreakContractSettlementDriverEnum.SettleStatus.YES.getCode())) {
+            return null;
+        }
+        return payMsg;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.driver.BatchUpdatePayDriverSettlementParam;
@@ -68,4 +69,11 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
             }
         });
     }
+
+    public static String formatPayMsg(Integer settlementStatus,String payMsg) {
+        if (!Objects.equals(settlementStatus, SettlementDriverEnum.Status.SETTLED.getCode())) {
+            return null;
+        }
+        return payMsg;
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverStruct.java

@@ -22,7 +22,7 @@ public interface BreakContractSettlementDriverStruct {
     @Mapping(target = "settleStatusMsg", expression = "java(BreakContractSettlementDriverEnum.SettleStatus.getMsgByCode(detail.getSettleStatus()))")
     @Mapping(target = "settlePlatformMsg", expression = "java(BreakContractSettlementDriverEnum.SettlePlatform.getMsgByCode(detail.getSettlePlatform()))")
     @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
-    @Mapping(target = "payRemark", expression = "java(if(Objects.equals(settleStatus,BreakContractSettlementDriverEnum.SettleStatus.YES.getCode())){return null}else{return payRemark})")
+    @Mapping(target = "payRemark", expression = "com.clx.performance.service.impl.breakcontract.BreakContractSettlementDriverServiceImpl.formatPayMsg(settleStatus,payRemark)")
     PageCarrierBreakContractSettlementDriverVO convert(BreakContractSettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementDriverStruct.java

@@ -16,7 +16,7 @@ public interface SettlementDriverStruct {
 
     @Named("toBaseVo")
 
-    @Mapping(target = "payErrorMsg", expression = "java(if(Objects.equals(status,SettlementDriverEnum.Status.SETTLED.getCode())){return null}else{return payRemark})")
+    @Mapping(target = "payErrorMsg", expression = "com.clx.performance.service.impl.settle.SettlementDriverServiceImpl.formatPayMsg(status,payErrorMsg)")
     CarrierPageSettlementDriverVO convert(SettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")