更新！

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

@@ -1,27 +0,0 @@
-package com.zhongshu.card.client.model.paySetting.paySetting;
-
-import com.github.microservice.types.payment.PaymentType;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/7/26
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectPaySettingConfig {
-
-    @Schema(description = "项目id")
-    private String projectOid;
-
-    @Schema(description = "项目的支付渠道设置")
-    private PaymentType channelType;
-
-    @Schema(description = "关联的微信支付配置")
-    private WxPayConfigModel wxPayConfig;
-
-}

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

@@ -1,19 +0,0 @@
-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/7/26
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectPaySettingSearch{
-    @Schema(description = "项目id")
-    private String projectOid;
-
-}

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

@@ -1,55 +0,0 @@
-package com.zhongshu.card.client.model.paySetting.paySetting;
-
-import com.github.microservice.types.payment.PaymentType;
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.paySetting.payConfig.FrictionlessUnionConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.FrictionlessWeChatConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.PaySharingConfig;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/10/9
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UnionFrictionlessSettingModel extends SuperModel {
-
-    @Schema(description = "项目名称")
-    private String projectName;
-
-    @Schema(description = "项目编码")
-    private String projectCode;
-
-    @NotNull
-    @Schema(description = "具体的支付方式")
-    private PaymentType paymentType;
-
-    private String paymentTypeStr;
-
-    public String getPaymentTypeStr() {
-        if (paymentType != null) {
-            return paymentType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "银联的无感支付 参数配置")
-    private FrictionlessUnionConfig frictionlessUnionConfig;
-
-    @Schema(description = "无感支付--微信关联配置")
-    private FrictionlessWeChatConfig frictionlessWeChatConfig;
-
-    @Schema(description = "拉卡拉无感支付--参数配置")
-    private LaKaLaCollectionConfig laKaLaCollectionConf;
-
-    @Schema(description = "分账规则")
-    private PaySharingConfig paySharingConfig;
-
-}

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

@@ -1,42 +0,0 @@
-package com.zhongshu.card.client.model.paySetting.paySetting;
-
-import com.github.microservice.types.payment.PaymentType;
-import com.zhongshu.card.client.model.base.ProjectOidParam;
-import com.zhongshu.card.client.model.paySetting.payConfig.FrictionlessUnionConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.FrictionlessWeChatConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
-import com.zhongshu.card.client.model.paySetting.payConfig.PaySharingConfig;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 项目无感支付的配置
- *
- * @author TRX
- * @date 2024/10/9
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UnionFrictionlessSettingParam extends ProjectOidParam {
-
-    @NotNull
-    @Schema(description = "具体的支付方式")
-    private PaymentType paymentType;
-
-    @Schema(description = "银联的无感支付 参数配置")
-    private FrictionlessUnionConfig frictionlessUnionConfig;
-
-    @Schema(description = "无感支付--微信关联配置")
-    private FrictionlessWeChatConfig frictionlessWeChatConfig;
-
-    @Schema(description = "拉卡拉无感支付--参数配置")
-    private LaKaLaCollectionConfig laKaLaCollectionConf;
-
-    @Schema(description = "分账规则")
-    private PaySharingConfig paySharingConfig;
-
-}

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

@@ -1,6 +1,5 @@
 package com.zhongshu.card.client.model.paySetting.paySetting;
 
-import com.zhongshu.card.client.model.base.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,5 @@
 package com.zhongshu.card.client.model.paySetting.paySetting;
 
-import com.zhongshu.card.client.model.base.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/paySetting/ProjectPaySettingController.java

@@ -2,8 +2,11 @@ package com.zhongshu.card.server.core.controller.paySetting;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
 import com.zhongshu.card.client.model.paySetting.paySetting.*;
 import com.zhongshu.card.server.core.service.paySetting.ProjectPaySettingServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
@@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author TRX
  * @date 2024/7/26
@@ -36,8 +41,37 @@ public class ProjectPaySettingController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到项目的微信支付配置", description = "得到项目的微信支付配置")
     @RequestMapping(value = "getWxPayConfig", method = {RequestMethod.POST})
-    public ResultContent<WxPayConfigParam> getWxPayConfig(@RequestBody ProjectPaySettingSearch param) {
+    public ResultContent<WxPayConfigParam> getWxPayConfig(@RequestBody ProjectOidParam param) {
         return projectPaySettingService.getWxPayConfig(param.getProjectOid());
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "保存项目的拉卡拉支付设置", description = "保存项目的拉卡拉支付设置")
+    @RequestMapping(value = "saveLaKaLaConfig", method = {RequestMethod.POST})
+    public ResultContent saveLaKaLaConfig(@RequestBody LaKaLaCollectionConfig param) {
+        return projectPaySettingService.saveLaKaLaConfig(param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到项目的拉卡拉支付配置", description = "得到项目的拉卡拉支付配置")
+    @RequestMapping(value = "getLaKaLaConfig", method = {RequestMethod.POST})
+    public ResultContent<LaKaLaCollectionConfig> getLaKaLaConfig(@RequestBody ProjectOidParam param) {
+        return projectPaySettingService.getLaKaLaConfig(param.getProjectOid());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到项目所有的支付渠道参数配置", description = "得到项目所有的支付渠道参数配置")
+    @RequestMapping(value = "getAllProjectPaySetting", method = {RequestMethod.POST})
+    public ResultContent<List<ProjectPaySettingModel>> getAllProjectPaySetting(@RequestBody ProjectOidParam param) {
+        return projectPaySettingService.getAllProjectPaySetting(param.getProjectOid());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除参数配置", description = "删除参数配置")
+    @RequestMapping(value = "deleteInfo", method = {RequestMethod.POST})
+    public ResultContent deleteInfo(
+            @RequestBody IDParam param) {
+        return projectPaySettingService.deleteInfo(param.getId());
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WxPayConfigDao.java

@@ -1,11 +0,0 @@
-package com.zhongshu.card.server.core.dao.payment;
-
-import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.server.core.domain.projectAbout.WxPayConfig;
-
-public interface WxPayConfigDao extends MongoDao<WxPayConfig> {
-
-    WxPayConfig findTopByProjectOid(String projectOid);
-
-    WxPayConfig findTopByAppId(String appId);
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/projectAbout/ProjectPaySettingDao.java

@@ -8,6 +8,8 @@ import java.util.List;
 
 public interface ProjectPaySettingDao extends MongoDao<ProjectPaySetting> {
 
+    ProjectPaySetting findTopById(String id);
+
     ProjectPaySetting findTopByProjectOid(String projectOid);
 
     ProjectPaySetting findTopByProjectOidAndChannelType(String projectOid, PaymentType channelType);

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/WalletSetting.java

@@ -1,45 +0,0 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
-
-import com.zhongshu.card.client.model.paySetting.payConfig.PaySharingConfig;
-import com.zhongshu.card.server.core.domain.base.SuperMain;
-import com.zhongshu.card.server.core.domain.org.Organization;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.mongodb.core.mapping.DBRef;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-/**
- * 项目的  钱包支付 余额支付配置
- *
- * @author TRX
- * @date 2024/9/25
- */
-@Data
-@Builder
-@Document
-@AllArgsConstructor
-@NoArgsConstructor
-public class WalletSetting extends SuperMain {
-
-    @Schema(description = "项目信息")
-    @DBRef(lazy = true)
-    private Organization projectInfo;
-
-    @Schema(description = "项目名称")
-    private String projectName;
-
-    @Schema(description = "项目编码")
-    private String projectCode;
-
-    //----------------------------业务信息 start-----------------
-
-    @Schema(description = "微信充值的配置")
-    private WxPayConfig wxPayConfig;
-
-    @Schema(description = "分账规则")
-    private PaySharingConfig paySharingConfig;
-
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/WxPayConfig.java

@@ -1,48 +0,0 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
-
-import com.zhongshu.card.server.core.domain.base.SuperMain;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-/**
- * 项目的微信支付配置信息
- *
- * @author TRX
- * @date 2024/7/26
- */
-@Data
-@Builder
-@Document
-@AllArgsConstructor
-@NoArgsConstructor
-public class WxPayConfig extends SuperMain {
-
-    @Schema(description = "appid")
-    private String appId;
-
-    @Schema(description = "商户证书序列号")
-    private String mchSerialNo;
-
-    @Schema(description = "商户id")
-    private String mchId;
-
-    @Schema(description = "API V3密钥")
-    private String apiV3Key;
-
-    @Schema(description = "认证类型")
-    private String authenticationType;
-
-    @Schema(description = "key文件地址类型，oss、local")
-    private String privateKeyType = "";
-
-    @Schema(description = "私钥地址")
-    private String privateKeyPath;
-
-    @Schema(description = "支付成功回调地址")
-    private String notifyUrl;
-
-}

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

@@ -144,8 +144,8 @@ public class ProjectChannelConfigService extends SuperService {
         if (ObjectUtils.isEmpty(entity)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
-
-        payChannelConfigDao.delete(entity);
+        // 支付产品不可删除
+//        payChannelConfigDao.delete(entity);
         return ResultContent.buildSuccess();
     }
 

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

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.service.paySetting;
 
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.paySetting.payConfig.LaKaLaCollectionConfig;
@@ -8,7 +9,6 @@ import com.zhongshu.card.client.model.paySetting.paySetting.*;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.ProjectPaySettingDao;
-import com.zhongshu.card.server.core.dao.payment.WxPayConfigDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import com.zhongshu.card.server.core.domain.paySetting.ProjectPaySetting;
@@ -34,9 +34,6 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectPaySettingServiceImpl extends SuperService {
 
-    @Autowired
-    WxPayConfigDao wxPayConfigDao;
-
     @Autowired
     ProjectPaySettingDao projectPaySettingDao;
 
@@ -120,6 +117,15 @@ public class ProjectPaySettingServiceImpl extends SuperService {
         return ResultContent.buildSuccess(models);
     }
 
+    public ResultContent deleteInfo(String id) {
+        ProjectPaySetting paySetting = projectPaySettingDao.findTopById(id);
+        if (ObjectUtils.isEmpty(paySetting)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
+        }
+        projectPaySettingDao.delete(paySetting);
+        return ResultContent.buildSuccess();
+    }
+
     //-----------------------------通用配置方法 start----------------------------
 
     private ProjectPaySetting getProjectPaySetting(String projectOid, PaymentType paymentType) {