Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java

@@ -9,4 +9,5 @@ public class RedissonConstants {
     public static final String SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:settlementOwner:batchPay:id:";
     //货主违约结算单支付锁
     public static final String BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:breakContractSettlementOwner:batchPay:id:";
+
 }

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

@@ -22,6 +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})")
     PageCarrierBreakContractSettlementDriverVO convert(BreakContractSettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

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

@@ -4,11 +4,21 @@ import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
+import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
 
 import java.util.List;
 
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
 public interface SettlementDriverStruct {
+
+    @Named("toBaseVo")
+
+    @Mapping(target = "payErrorMsg", expression = "java(if(Objects.equals(status,SettlementDriverEnum.Status.SETTLED.getCode())){return null}else{return payRemark})")
+    CarrierPageSettlementDriverVO convert(SettlementDriver detail);
+
+    @IterableMapping(qualifiedByName = "toBaseVo")
     List<CarrierPageSettlementDriverVO> covertList(List<SettlementDriver> records);
 }