Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountRunWaterRecordEnum.java → performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountRunningWaterRecordEnum.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-public enum OwnerLoanAccountRunWaterRecordEnum {
+public enum OwnerLoanAccountRunningWaterRecordEnum {
     ;
 
     //10：运单核销 20：借款
@@ -20,12 +20,12 @@ public enum OwnerLoanAccountRunWaterRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<OwnerLoanAccountRunWaterRecordEnum.RunWaterType> getByCode(int code) {
+        public static Optional<OwnerLoanAccountRunningWaterRecordEnum.RunWaterType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
 
         public static String getMsgByCode(int code) {
-            return getByCode(code).map(OwnerLoanAccountRunWaterRecordEnum.RunWaterType::getMsg).orElse(null);
+            return getByCode(code).map(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType::getMsg).orElse(null);
         }
     }
 

performance-web/src/main/java/com/clx/performance/dto/OwnerLoanAccountRunWaterRecordDTO.java

 package com.clx.performance.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * @ClassName OwnerLoanAccountRunWaterRecordDTO
@@ -16,6 +20,8 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class OwnerLoanAccountRunWaterRecordDTO {
 
     @ExcelProperty("货主编码")
@@ -42,13 +48,25 @@ public class OwnerLoanAccountRunWaterRecordDTO {
     @ExcelProperty("流水类型")
     private String runningWaterTypeMsg;
 
+    public String getRunningWaterTypeMsg(){
+        return OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.getMsgByCode(runningWaterType);
+    }
+
     @ExcelProperty("金额")
     private BigDecimal alterationBalance;
 
+    public BigDecimal getAlterationBalance(){
+        return Objects.isNull(alterationBalance)? null : alterationBalance.movePointLeft(2);
+    }
+
 
     @ExcelProperty("账户余额")
     private BigDecimal accountBalance;
 
+    public BigDecimal getAccountBalance(){
+        return Objects.isNull(accountBalance)? null : accountBalance.movePointLeft(2);
+    }
+
     @ExcelProperty("操作人")
     private String createBy;
 

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -14,7 +14,7 @@ import com.nbopen.api.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,11 +46,13 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
         downloadUsingStream(nbBankConfig.getPublicKeyPath(), "/app/nbbank/bankPubKey.cer");
         downloadUsingStream(nbBankConfig.getPrivateKeyPath(), "/app/nbbank/bankPrivateKey.sm2");
+        downloadUsingStream(nbBankConfig.getPrivateKeyPath(), "/app/nbbank/bankConfig.json");
+
+        FileSystemResource resource = new FileSystemResource("/app/nbbank/bankConfig.json");
 
-        ClassPathResource classPathResource = new ClassPathResource("bank/config-nbbank.json");
         InputStream inputStream;
         try {
-            inputStream = classPathResource.getInputStream();
+            inputStream = resource.getInputStream();
             boolean initResult = NBOpenSDK.init(inputStream);
             log.info("宁波银行SDK初始化, 状态:{}", initResult);
             log.info("sdk版本信息:{}", NBOpenSDK.getVersionInfo());

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerLoanAccountRunningWaterRecordStruct.java

@@ -4,10 +4,7 @@ import com.clx.performance.dto.OwnerLoanAccountRunWaterRecordDTO;
 import com.clx.performance.model.loan.OwnerLoanAccountRunningWaterRecord;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRunWaterRecordVO;
 import com.msl.common.utils.DateStructUtil;
-import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Named;
 
 import java.util.List;
 import java.util.Objects;
@@ -17,13 +14,7 @@ public interface OwnerLoanAccountRunningWaterRecordStruct {
 
     List<OwnerLoanRunWaterRecordVO> convertList(List<OwnerLoanAccountRunningWaterRecord> list);
 
-    @Named("toBaseVo")
-    @Mapping(target = "alterationBalance", expression = "java(Objects.isNull(record.getAlterationBalance())? null : record.getAlterationBalance().movePointLeft(2))")
-    @Mapping(target = "accountBalance", expression = "java(Objects.isNull(record.getAccountBalance())? null : record.getAccountBalance().movePointLeft(2))")
-//    @Mapping(target = "runningWaterTypeMsg", expression = "java(OwnerLoanAccountRunWaterRecordEnum.RunWaterType.getMsgByCode(record.getRunningWaterType()))")
-    OwnerLoanAccountRunWaterRecordDTO convertDTO(OwnerLoanAccountRunningWaterRecord record);
 
-    @IterableMapping(qualifiedByName = "toBaseVo")
     List<OwnerLoanAccountRunWaterRecordDTO> convertDTOList(List<OwnerLoanAccountRunningWaterRecord> list);
 
 }