更新！

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

@@ -0,0 +1,32 @@
+package com.zhongshu.card.client.model.paySetting.paySetting;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/11/13
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrgPayConfigModel {
+
+    @Schema(description = "账户/名称")
+    private String name;
+
+    @Schema(description = "商户ID")
+    private String mchId;
+
+    @Schema(description = "银行账号")
+    private String bankAccountNumber;
+
+    @Schema(description = "开户行")
+    private String bankName;
+
+    @Schema(description = "开户支行")
+    private String bankSubName;
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/config/NetDiskClientConfig.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.config;
 
+import com.github.microservice.netdisk.config.NetDiskClientConfiguration;
 import com.github.microservice.netdisk.config.NetDiskServerConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -9,6 +10,6 @@ import org.springframework.context.annotation.Import;
  * @date 2024/11/13
  */
 @Configuration
-@Import(NetDiskServerConfiguration.class)
+@Import(NetDiskClientConfiguration.class)
 public class NetDiskClientConfig {
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/upLoadFile/OssController.java

@@ -34,4 +34,6 @@ public class OssController {
     public ResultContent<StsToken> getUploadToken(@RequestBody RemoteFile remoteFile) {
         return netDiskOssService.getUploadToken(remoteFile);
     }
+
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -15,6 +15,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
+import com.github.microservice.netdisk.client.service.NetDiskAccountService;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.project.ProjectSaveParam;
 import com.zhongshu.card.client.service.org.OrganizationService;
@@ -130,6 +131,9 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     @Autowired
     private SignService signService;
 
+    @Autowired
+    private NetDiskAccountService netDiskAccountService;
+
     /**
      * 保存项目信息
      *
@@ -202,6 +206,8 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         //todo  同步名称至openApi网关
         signService.syncBusinessName(organization.getOid(), organization.getName());
         organizationUserServiceImpl.orgBindManager(organization, userAccounts);
+        com.github.microservice.netdisk.client.content.ResultContent<String> resultContent = netDiskAccountService.create(organization.getOid());
+        log.info("创建文件账号： {}", resultContent.getState());
         return ResultContent.buildSuccess();
     }
 
@@ -1024,6 +1030,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             oid = organization.getOid();
             log.info("平台管理员账号已存在...");
         }
+        netDiskAccountService.create(oid);
         return ResultContent.buildSuccess(oid);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/oss/NetDiskOssService.java

@@ -39,6 +39,9 @@ public class NetDiskOssService extends SuperService {
     @Autowired
     UserCountDao userCountDao;
 
+
+
+
     public ResultContent<StsToken> getUploadToken(RemoteFile remoteFile) {
 //        PathAssert.validate(remoteFile.getPath());
         String userId = getCurrentUserId();

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

@@ -32,7 +32,6 @@ import com.zhongshu.card.server.core.domain.paySetting.ProjectPaySetting;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.AesUtils;
 import com.zhongshu.card.server.core.util.BeanUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -438,6 +437,23 @@ public class ProjectPaySettingServiceImpl extends SuperService {
         return ResultContent.buildSuccess(projectPaySettingInfo);
     }
 
+    /**
+     * 得到结构在项目的支付配置
+     *
+     * @param projectOid
+     * @param oid
+     * @param paymentType
+     */
+    public OrgPayConfigModel getOrgPayConfig(String projectOid, String oid, PaymentType paymentType) {
+        OrgPayConfigModel model = null;
+        ProjectOrgPaySettingInfo temp = projectPaySettingInfoDao.findTopByBelongOigAndProjectOidAndChannelType(oid, projectOid, paymentType);
+        if (ObjectUtils.isNotEmpty(temp)) {
+            model = new OrgPayConfigModel();
+            BeanUtils.copyProperties(temp, model);
+        }
+        return model;
+    }
+
     public ResultContent initChangeDefault(String id, String belongOig, String projectOid, PaymentType paymentType) {
         List<ProjectOrgPaySettingInfo> list = projectPaySettingInfoDao.findByBelongOigAndProjectOidAndChannelType(belongOig, projectOid, paymentType);
         if (ObjectUtils.isNotEmpty(list)) {