更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/ProjectPaySettingInfoModel.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 
 /**
  * @author TRX
@@ -26,6 +27,25 @@ public class ProjectPaySettingInfoModel extends SuperModel {
     @Schema(description = "名称")
     private String name;
 
+    @Schema(description = "显示的")
+    private String code = "";
+
+    public String getCode() {
+        if(payConfig != null) {
+            if (channelType == PaymentType.WeChat) {
+                try{
+                    WxPayConfigModel configModel = (WxPayConfigModel) payConfig;
+                    if (ObjectUtils.isNotEmpty(configModel)) {
+                        return configModel.getMchId();
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }
+        return "";
+    }
+
     @Schema(description = "项目的支付渠道设置：微信支付、银联支付")
     private PaymentType channelType;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/WxPayConfigModel.java

@@ -45,6 +45,9 @@ public class WxPayConfigModel {
     @Schema(description = "证书字符串")
     private String privateKeyStr;
 
+    @Schema(description = "文件名称")
+    private String privateKeyFile;
+
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectPaySettingServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -170,7 +171,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
         }
         List<ProjectPaySettingInfo> list = projectPaySettingInfoDao.findByProjectOidAndChannelType(projectPaySetting.getProjectOid(), projectPaySetting.getChannelType());
         if (ObjectUtils.isNotEmpty(list)) {
-            models = list.stream().map(this::toModel).collect(Collectors.toUnmodifiableList());
+            models = list.parallelStream().map(this::toModel).collect(Collectors.toUnmodifiableList());
         }
         return ResultContent.buildSuccess(models);
     }
@@ -221,18 +222,23 @@ public class ProjectPaySettingServiceImpl extends SuperService {
         }
         ProjectPaySettingInfo settingInfo = content.getContent();
 
-        WxPayConfigModel configModel = (WxPayConfigModel) settingInfo.getPayConfig();
+        WxPayConfigModel configModel = null;
+        if (settingInfo.getPayConfig() != null) {
+            configModel = (WxPayConfigModel) settingInfo.getPayConfig();
+        }
         if (ObjectUtils.isEmpty(configModel)) {
             configModel = new WxPayConfigModel();
         }
         BeanUtils.copyProperties(param, configModel);
 
-        String privateKeyStr = AesUtils.turnMultipartFileToString(param.getPrivateKeyFile());
+        MultipartFile privateKeyFile = param.getPrivateKeyFile();
+        String privateKeyStr = AesUtils.turnMultipartFileToString(privateKeyFile);
         if (StringUtils.isNotEmpty(privateKeyStr)) {
             configModel.setPrivateKeyStr(privateKeyStr);
+            configModel.setPrivateKeyFile(privateKeyFile.getOriginalFilename());
         }
         configModel.setPrivateKeyType("str");
-        if (StringUtils.isNotEmpty(configModel.getPrivateKeyStr())) {
+        if (StringUtils.isEmpty(configModel.getPrivateKeyStr())) {
             return ResultContent.buildFail("证书文件为空");
         }
         settingInfo.setPayConfig(configModel);
@@ -306,6 +312,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
             if (ObjectUtils.isEmpty(projectPaySettingInfo)) {
                 return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
             }
+            initUpdateEntity(projectPaySettingInfo);
         } else {
             if (StringUtils.isEmpty(param.getProjectPaySettingId())) {
                 return ResultContent.buildFail("projectPaySettingId不能为空");
@@ -322,6 +329,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
             projectPaySettingInfo.setProjectOid(project.getOid());
             projectPaySettingInfo.setProjectName(project.getName());
             projectPaySettingInfo.setProjectCode(project.getCode());
+            projectPaySettingInfo.setOid(project.getOid());
             int total = projectPaySettingInfoDao.countByProjectOidAndChannelType(project.getOid(), paySetting.getChannelType());
             if (total <= 0) {
                 param.setIsDefault(Boolean.TRUE);