Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

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 = "com.clx.performance.service.impl.breakcontract.BreakContractSettlementDriverServiceImpl.formatPayMsg(settleStatus,payRemark)")
+    @Mapping(target = "payRemark", expression = "java(com.clx.performance.service.impl.breakcontract.BreakContractSettlementDriverServiceImpl.formatPayMsg(detail.getSettleStatus(),detail.getPayRemark()))")
     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 = "com.clx.performance.service.impl.settle.SettlementDriverServiceImpl.formatPayMsg(status,payErrorMsg)")
+    @Mapping(target = "payErrorMsg", expression = "java(com.clx.performance.service.impl.settle.SettlementDriverServiceImpl.formatPayMsg(detail.getStatus(),detail.getPayErrorMsg()))")
     CarrierPageSettlementDriverVO convert(SettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")