更新！

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

@@ -1,25 +0,0 @@
-package com.zhongshu.card.client.model.paySetting.paySetting;
-
-import com.github.microservice.types.payment.PaymentType;
-import com.zhongshu.card.client.model.projectAbout.PayChannelConfigModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author TRX
- * @date 2024/7/26
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectPaySettingAllModel extends ProjectPaySettingModel {
-
-    @Schema(description = "字段")
-    private List<PayConfigField> fields = new ArrayList<>();
-
-}

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

@@ -1,22 +1,11 @@
 package com.zhongshu.card.server.core.service.paySetting;
 
-import com.github.microservice.net.ResultContent;
-import com.github.microservice.pay.client.model.AccountModel;
-import com.github.microservice.pay.client.model.PayProductChannelConf;
-import com.github.microservice.pay.client.product.senseless.laKaLacollection.conf.LaKaLaCollectionConf;
-import com.github.microservice.pay.client.ret.ResultState;
 import com.github.microservice.pay.client.service.PayProductAccountService;
-import com.github.microservice.pay.client.type.PayProductChannelType;
 import com.github.microservice.types.payment.PaymentType;
-import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
 import com.zhongshu.card.server.core.dao.projectAbout.OrgPayAccountDao;
-import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.paySetting.OrgPayAccount;
-import com.zhongshu.card.server.core.domain.paySetting.ProjectPaySetting;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -7,7 +7,6 @@ import com.github.microservice.types.payment.PaymentChannelType;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.projectAbout.*;
 import com.zhongshu.card.client.type.DataState;
-import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.PayChannelConfigDao;
 import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import com.zhongshu.card.server.core.service.base.SuperService;
@@ -34,9 +33,6 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectChannelConfigService extends SuperService {
 
-    @Autowired
-    OrganizationDao organizationDao;
-
     @Autowired
     PayChannelConfigDao payChannelConfigDao;
 

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

@@ -1,14 +1,12 @@
 package com.zhongshu.card.server.core.service.paySetting;
 
-import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.payment.PayFieldType;
 import com.github.microservice.types.payment.PaymentType;
-import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
 import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfigParam;
 import com.zhongshu.card.client.model.paySetting.paySetting.*;
-import com.zhongshu.card.client.model.projectAbout.PayChannelConfigModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.PayChannelConfigDao;
@@ -27,10 +25,8 @@ 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.Base64;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -427,7 +423,7 @@ public class ProjectPaySettingServiceImpl extends SuperService {
     }
 
     /**
-     * 得到项目的对应支付渠道的 参数配置
+     * 得到项目的对应支付渠道的 参数配置 （验证是否一切正常）
      *
      * @param projectOid
      * @param paymentType
@@ -456,11 +452,10 @@ public class ProjectPaySettingServiceImpl extends SuperService {
             return ResultContent.buildFail(String.format("项目 %s未启动", payName));
         }
 
-        // 配置的
-        ProjectPaySettingInfo paySettingInfo = projectPaySettingInfoDao.findTopByProjectOidAndChannelTypeAndIsDefault(
-                projectOid, paymentType, Boolean.TRUE);
+        // 参数的配置 （默认状态的）
+        ProjectPaySettingInfo paySettingInfo = projectPaySettingInfoDao.findTopByProjectOidAndChannelTypeAndIsDefault(projectOid, paymentType, Boolean.TRUE);
         if (ObjectUtils.isEmpty(paySettingInfo)) {
-            return ResultContent.buildFail(String.format("%s没有默认的支付参数", payName));
+            return ResultContent.buildFail(String.format("%s没有默认的支付配置", payName));
         }
         return ResultContent.buildSuccess(paySettingInfo);
     }