Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java

@@ -65,7 +65,7 @@ public class CarrierPageSettlementDriverDetailVO {
     private Integer loanFlag;
 
     @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
-    private Integer loanFlagMsg;
+    private String loanFlagMsg;
 
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -64,7 +64,7 @@ public class CarrierPageSettlementDriverVO {
     private Integer loanFlag;
 
     @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
-    private Integer loanFlagMsg;
+    private String loanFlagMsg;
 
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")

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

@@ -13,7 +13,7 @@ import java.util.List;
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
 public interface SettlementDriverDetailStruct {
 
-    @Mapping(target = "loanFlagMsg", expression = "java(OwnerLoanRecordEnum.LoanFlag.getMsgByCode(detail.getLoanFlag()))")
+    @Mapping(target = "loanFlagMsg", expression = "java(com.clx.performance.enums.loan.OwnerLoanRecordEnum.LoanFlag.getMsgByCode(detail.getLoanFlag()))")
     List<CarrierPageSettlementDriverDetailVO> covertList(List<SettlementDriverDetail> records);
 
     OrderChildSyncTransportRecord convertRecord(SettlementDriverDetail detail);

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

@@ -8,7 +8,6 @@ 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})
@@ -17,7 +16,7 @@ public interface SettlementDriverStruct {
     @Named("toBaseVo")
 
     @Mapping(target = "payErrorMsg", expression = "java(com.clx.performance.service.impl.settle.SettlementDriverServiceImpl.formatPayMsg(detail.getStatus(),detail.getPayErrorMsg()))")
-    @Mapping(target = "loanFlagMsg", expression = "java(OwnerLoanRecordEnum.LoanFlag.getMsgByCode(detail.getLoanFlag()))")
+    @Mapping(target = "loanFlagMsg", expression = "java(com.clx.performance.enums.loan.OwnerLoanRecordEnum.LoanFlag.getMsgByCode(detail.getLoanFlag()))")
     CarrierPageSettlementDriverVO convert(SettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")