更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/payConfig/DirectPayAliPayConfig.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/payConfig/DirectPayAliPayConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.payConfig;
+package com.zhongshu.card.client.model.paySetting.payConfig;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/payConfig/DirectPayWeChatConfig.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/payConfig/DirectPayWeChatConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.payConfig;
+package com.zhongshu.card.client.model.paySetting.payConfig;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/payConfig/FrictionlessUnionConfig.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/payConfig/FrictionlessUnionConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.payConfig;
+package com.zhongshu.card.client.model.paySetting.payConfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/payConfig/FrictionlessWeChatConfig.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/payConfig/FrictionlessWeChatConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.payConfig;
+package com.zhongshu.card.client.model.paySetting.payConfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,36 @@
+package com.zhongshu.card.client.model.paySetting.payConfig;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 拉卡拉支付 参数
+ *
+ * @author TRX
+ * @date 2024/10/8
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LaKaLaCollectionConf {
+
+    // 接入方唯一编号（appid）：OP00000003
+    private String appId;
+
+    // 证书序列号（serial_no）：00dfba8194c41b84cf
+    private String serialNo;
+
+    // 国密4（SM4Key）：uIj6CPg1GZAY10dXFfsEAQ==
+    private String sm4Key;
+
+    // 商户私钥地址,用于请求签名
+    private String priKeyBase64;
+
+    // 拉卡拉公钥证书地址,用于验签（测试证书为：lkl-apigw-v2.cer）
+    private String lklCerBase64;
+
+    // 拉卡拉支付平台证书地址2(用于拉卡拉通知验签，证书与lklCerPath)一致，测试证书为：lkl-apigw-v2.cer）
+    private String lklNotifyCerBase64;
+
+}

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/payConfig/PaySharingConfig.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/payConfig/PaySharingConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.payConfig;
+package com.zhongshu.card.client.model.paySetting.payConfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/paySetting/ProjectPaySettingModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/ProjectPaySettingModel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ProjectPaySettingModel {
+
     @Schema(description = "项目id")
     private String projectOid;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/paySetting/ProjectPaySettingParam.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/ProjectPaySettingParam.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,8 @@
+package com.zhongshu.card.client.model.paySetting.paySetting;
+
+/**
+ * @author TRX
+ * @date 2024/10/9
+ */
+public class UnionFrictionlessSettingModel {
+}

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

@@ -0,0 +1,13 @@
+package com.zhongshu.card.client.model.paySetting.paySetting;
+
+import com.zhongshu.card.client.model.base.ProjectOidParam;
+
+/**
+ * 项目无感支付的配置
+ *
+ * @author TRX
+ * @date 2024/10/9
+ */
+public class UnionFrictionlessSettingParam extends ProjectOidParam {
+
+}

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,22 +24,22 @@ public class WxPayConfigModel {
     private String appId;
 
     @Schema(description = "商户证书序列号")
-    public String mchSerialNo;
+    private String mchSerialNo;
 
     @Schema(description = "商户id")
-    public String mchId;
+    private String mchId;
 
     @Schema(description = "API V3密钥")
-    public String apiV3Key;
+    private String apiV3Key;
 
     @Schema(description = "认证类型")
-    public String authenticationType;
+    private String authenticationType;
 
     @Schema(description = "key文件地址类型，oss、local")
     private String privateKeyType = "";
 
     @Schema(description = "私钥地址")
-    public String privateKeyPath;
+    private String privateKeyPath;
 
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout.paySetting;
+package com.zhongshu.card.client.model.paySetting.paySetting;
 
 import com.zhongshu.card.client.model.base.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/PayChannelConfigModel.java

@@ -17,6 +17,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class PayChannelConfigModel extends SuperModel {
+
     @Schema(description = "支付产品名称")
     private String name;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/feign/ProjectPaySettingFeignService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.feign;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.paySetting.paySetting.WxPayConfigModel;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

FullCardClient/src/main/java/com/zhongshu/card/client/service/feign/ProjectPaySettingService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.feign;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.projectAbout.paySetting.*;
+import com.zhongshu.card.client.model.paySetting.paySetting.*;
 
 
 public interface ProjectPaySettingService {

FullCardClient/src/main/java/com/zhongshu/card/client/type/OrganizationState.java

@@ -9,7 +9,7 @@ public enum OrganizationState {
 
     Normal("正常"),
     Locked("禁用"),
-    Frozen("冻结"),
+    Frozen("冻结"), // 不使用
     ;
 
     @Getter

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ProjectOpenAPIController.java

@@ -32,7 +32,7 @@ import javax.validation.Valid;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/v1/openAPI/projectManager")
+@RequestMapping("/openAPI/v1/projectManager")
 @Tag(name = "openAPI-项目管理")
 public class ProjectOpenAPIController {
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationUserController.java

@@ -36,6 +36,12 @@ public class OrganizationUserController {
     @Autowired
     private UserAccountService userAccountService;
 
+    /**
+     * 现在主要是给用项目添加用户信息
+     *
+     * @param param
+     * @return
+     */
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "机构保存用户", description = "机构保存用户")
     @RequestMapping(value = {"saveOrgUser"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/OrganizationManagerController.java

@@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import java.util.List;
 
+/**
+ * 超级管理员管理所有的机构
+ */
 @RestController
 @RequestMapping("organizationManager")
 @Tag(name = "机构数据管理")

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

@@ -0,0 +1,77 @@
+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.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
+import com.zhongshu.card.client.model.paySetting.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.PayChannelConfigModel;
+import com.zhongshu.card.client.model.projectAbout.PayChannelConfigParam;
+import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingService;
+import com.zhongshu.card.server.core.service.paySetting.ProjectChannelConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 项目的支付渠道设置
+ *
+ * @author TRX
+ * @date 2024/7/26
+ */
+@RestController
+@RequestMapping("/project/projectChannel")
+@Tag(name = "项目-支付设置")
+public class ProjectChannelController {
+
+    @Autowired
+    private ProjectPaySettingService projectPaySettingService;
+
+    @Autowired
+    private ProjectChannelConfigService projectChannelConfigService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "保存支付渠道数据", description = "保存支付渠道数据")
+    @RequestMapping(value = "savePayChannelConfig", method = {RequestMethod.POST})
+    public ResultContent savePayChannelConfig(@RequestBody PayChannelConfigParam param) {
+        return projectChannelConfigService.savePayChannelConfig(param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "数据列表-分页查询", description = "数据列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<PayChannelConfigModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) PayChannelConfigSearch param) {
+        return projectChannelConfigService.page(param, pageable);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除数据", description = "删除数据")
+    @RequestMapping(value = "deleteData", method = {RequestMethod.POST})
+    public ResultContent deleteData(@RequestBody IDParam param) {
+        return projectChannelConfigService.deleteData(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "数据详情", description = "数据详情")
+    @RequestMapping(value = "getDetail", method = {RequestMethod.POST})
+    public ResultContent getDetail(@RequestBody IDParam param) {
+        return projectChannelConfigService.getDetail(param.getId());
+    }
+
+    //------------------------------feign start -----------------------
+    @Operation(hidden = true, summary = "根据小程序appId得到配置", description = "根据小程序appId得到配置")
+    @RequestMapping(value = "manager/getProjectWxPayConfig", method = {RequestMethod.POST})
+    public ResultContent<WxPayConfigModel> getProjectWxPayConfig(@RequestBody ProjectWxPayParam param) {
+        return projectPaySettingService.getProjectWxPayConfig(param);
+    }
+}

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

@@ -1,10 +1,10 @@
-package com.zhongshu.card.server.core.controller.projectAbout;
+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.feign.ProjectWxPayParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.projectAbout.paySetting.*;
+import com.zhongshu.card.client.model.paySetting.paySetting.*;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ProjectPaySettingController {
 
     @Autowired
-    ProjectPaySettingService projectPaySettingService;
+    private ProjectPaySettingService projectPaySettingService;
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设置项目的支付类型", description = "设置项目的支付类型")
@@ -36,7 +36,8 @@ public class ProjectPaySettingController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到项目的支付方式配置", description = "得到项目的支付方式配置")
     @RequestMapping(value = "getProjectPaySetting", method = {RequestMethod.POST})
-    public ResultContent<ProjectPaySettingModel> getProjectPaySetting(@RequestBody ProjectPaySettingSearch param) {
+    public ResultContent<ProjectPaySettingModel> getProjectPaySetting(
+            @RequestBody ProjectPaySettingSearch param) {
         return projectPaySettingService.getProjectPaySetting(param);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/SignatureController.java

@@ -1,52 +0,0 @@
-package com.zhongshu.card.server.core.controller.payment;
-
-import com.github.microservice.auth.client.constant.AuthConstant;
-import com.github.microservice.auth.client.content.ResultContent;
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.payment.BaseModel;
-import com.zhongshu.card.client.model.payment.ComplexModel;
-import com.zhongshu.card.client.model.payment.RegmerTypeModel;
-import com.zhongshu.card.server.core.service.payment.SignatureServiceImpl;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-/**
- * @author TRX
- * @date 2024/6/19
- */
-@RestController
-@RequestMapping("/school/signature")
-@Tag(name = "学校-账户管理")
-public class SignatureController {
-    @Autowired
-    SignatureServiceImpl signatureService;
-
-
-    @Operation(summary = "查询正在进行的签约流程")
-    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "complexIng", method = RequestMethod.POST)
-    public ResultContent<ComplexModel> complexIng(@Valid @RequestBody BaseModel baseModel) {
-        return signatureService.complexIng(baseModel);
-    }
-
-    @Operation(description = "变更或者发起流程", summary = "变更或者发起流程")
-    @RequestMapping(value = "startComplex", method = RequestMethod.POST)
-    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "user", type = AuthType.User)
-    public ResultContent startComplex(@Valid @RequestBody RegmerTypeModel reg_mer_type) {
-
-        return signatureService.startComplex(reg_mer_type);
-    }
-
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationRelationDaoImpl.java

@@ -37,10 +37,12 @@ public class OrganizationRelationDaoImpl extends BaseImpl implements Organizatio
     public Page<OrganizationRelation> page(Pageable pageable, OrganizationRelationSearch param) {
         Criteria criteria = new Criteria();
 
+        // 主数据id
         if (StringUtils.isNotEmpty(param.getMainId())) {
             criteria.and("mainOrganization").is(Organization.build(param.getMainId()));
         }
 
+        // 关联的机构数据id
         if (StringUtils.isNotEmpty(param.getRelId())) {
             criteria.and("relOrganization").is(Organization.build(param.getRelId()));
         }

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

@@ -3,9 +3,7 @@ package com.zhongshu.card.server.core.dao.projectAbout;
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.github.microservice.types.payment.PaymentChannelType;
 import com.zhongshu.card.server.core.dao.projectAbout.extend.PayChannelConfigDaoExtend;
-import com.zhongshu.card.server.core.dao.projectAbout.extend.ProjectExcelTemplateDaoExtend;
-import com.zhongshu.card.server.core.domain.projectAbout.PayChannelConfig;
-import com.zhongshu.card.server.core.domain.projectAbout.ProjectExcelTemplate;
+import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 
 /**
  * 项目关联的 支付配置

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

@@ -1,8 +1,7 @@
 package com.zhongshu.card.server.core.dao.projectAbout;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
-import com.zhongshu.card.server.core.domain.projectAbout.ProjectCommonConfig;
+import com.zhongshu.card.server.core.domain.paySetting.PayShareList;
 
 /**
  *

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

@@ -0,0 +1,13 @@
+package com.zhongshu.card.server.core.dao.projectAbout;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.domain.paySetting.UnionFrictionlessSetting;
+
+/**
+ * 项目的无感支付设置
+ */
+public interface UnionFrictionlessSettingDao extends MongoDao<UnionFrictionlessSetting> {
+
+    UnionFrictionlessSetting findTopById(String id);
+
+}

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

@@ -1,9 +1,7 @@
 package com.zhongshu.card.server.core.dao.projectAbout.extend;
 
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
-import com.zhongshu.card.client.model.projectAbout.ProjectExcelTemplateSearch;
-import com.zhongshu.card.server.core.domain.projectAbout.PayChannelConfig;
-import com.zhongshu.card.server.core.domain.projectAbout.ProjectExcelTemplate;
+import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

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

@@ -2,13 +2,9 @@ package com.zhongshu.card.server.core.dao.projectAbout.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
-import com.zhongshu.card.client.model.projectAbout.ProjectExcelTemplateSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.projectAbout.extend.PayChannelConfigDaoExtend;
-import com.zhongshu.card.server.core.dao.projectAbout.extend.ProjectExcelTemplateDaoExtend;
-import com.zhongshu.card.server.core.domain.projectAbout.PayChannelConfig;
-import com.zhongshu.card.server.core.domain.projectAbout.ProjectExcelTemplate;
-import com.zhongshu.card.server.core.util.CommonUtil;
+import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationRelation.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OrganizationRelationType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
-import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
+import com.zhongshu.card.server.core.domain.paySetting.PayShareList;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/DirectPaySetting.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/DirectPaySetting.java

@@ -1,7 +1,7 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
+package com.zhongshu.card.server.core.domain.paySetting;
 
-import com.zhongshu.card.client.model.projectAbout.payConfig.DirectPayAliPayConfig;
-import com.zhongshu.card.client.model.projectAbout.payConfig.DirectPayWeChatConfig;
+import com.zhongshu.card.client.model.paySetting.payConfig.DirectPayAliPayConfig;
+import com.zhongshu.card.client.model.paySetting.payConfig.DirectPayWeChatConfig;
 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;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/PayChannelConfig.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/PayChannelConfig.java

@@ -1,7 +1,6 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
+package com.zhongshu.card.server.core.domain.paySetting;
 
 import com.github.microservice.types.payment.PaymentChannelType;
-import com.github.microservice.types.payment.PaymentType;
 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;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/PayShareList.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/PayShareList.java

@@ -1,7 +1,5 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
+package com.zhongshu.card.server.core.domain.paySetting;
 
-import com.zhongshu.card.client.model.projectAbout.payConfig.DirectPayAliPayConfig;
-import com.zhongshu.card.client.model.projectAbout.payConfig.DirectPayWeChatConfig;
 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;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/UnionFrictionlessSetting.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/UnionFrictionlessSetting.java

@@ -1,8 +1,10 @@
-package com.zhongshu.card.server.core.domain.projectAbout;
+package com.zhongshu.card.server.core.domain.paySetting;
 
-import com.zhongshu.card.client.model.projectAbout.payConfig.FrictionlessUnionConfig;
-import com.zhongshu.card.client.model.projectAbout.payConfig.FrictionlessWeChatConfig;
-import com.zhongshu.card.client.model.projectAbout.payConfig.PaySharingConfig;
+import com.github.microservice.types.payment.PaymentType;
+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.LaKaLaCollectionConf;
+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;
@@ -36,20 +38,20 @@ public class UnionFrictionlessSetting extends SuperMain {
     @Schema(description = "项目编码")
     private String projectCode;
 
-    //----------------------------业务信息 start-----------------
+    @Schema(description = "具体的支付方式")
+    private PaymentType paymentType;
 
-    @Schema(description = "是否开启银联无感支付")
-    private Boolean isOpenUnionFrictionless = Boolean.FALSE;
+    //----------------------------业务信息 start-----------------
 
     @Schema(description = "银联的无感支付 参数配置")
     private FrictionlessUnionConfig frictionlessUnionConfig;
 
-    @Schema(description = "打开无感支付 - 微信授权支付")
-    private Boolean isOpenWeChatFrictionlessConfig = Boolean.FALSE;
-
-    @Schema(description = "无感支付--微信关联数据")
+    @Schema(description = "无感支付--微信关联配置")
     private FrictionlessWeChatConfig frictionlessWeChatConfig;
 
+    @Schema(description = "拉卡拉无感支付--参数配置")
+    private LaKaLaCollectionConf laKaLaCollectionConf;
+
     @Schema(description = "分账规则")
     private PaySharingConfig paySharingConfig;
 

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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.projectAbout;
 
-import com.zhongshu.card.client.model.projectAbout.payConfig.PaySharingConfig;
+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;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenAPIRegisterService.java

@@ -1,6 +1,8 @@
 package com.zhongshu.card.server.core.service.openAPI;
 
 import cn.hutool.json.JSONObject;
+import com.github.microservice.models.openAPI.OpenApiInfo;
+import com.github.microservice.models.openAPI.RefreshApiParam;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.utils.OpenAPIScan;
 import lombok.extern.slf4j.Slf4j;
@@ -31,14 +33,21 @@ public class OpenAPIRegisterService {
 
     public ResultContent initRegisterPAIS() {
         String str = restTemplate.getForObject("http://" + serviceId + "/v3/api-docs", String.class);
-        List<JSONObject> openAPIS = OpenAPIScan.scanAPI(str);
-
-//        ResultContent content = restTemplate.postForObject("http://opengateway/v3/api-docs", openAPIS, ResultContent.class);
-//        if (content.isFailed()) {
-//            log.info("openApi注册错误: {}", content.getMsg());
-//        } else {
-//            log.info("openApi注册成功");
-//        }
+        List<OpenApiInfo> openAPIS = OpenAPIScan.scanAPI(str, "一卡通");
+        RefreshApiParam param = new RefreshApiParam();
+        param.setServerName(serviceId.toLowerCase());
+        param.setPredicateArgs("/openApi/**");
+        param.setOpenApiInfo(openAPIS);
+
+        ResultContent content = restTemplate.postForObject("http://openapiserver/openapi/manager/api/refresh", param, ResultContent.class);
+        if (content == null) {
+            content = ResultContent.buildSuccess();
+        }
+        if (content.isFailed()) {
+            log.info("openApi注册错误: {}", content.getMsg());
+        } else {
+            log.info("openApi注册成功");
+        }
         str = null;
         return ResultContent.buildSuccess();
     }

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

@@ -121,11 +121,10 @@ public class OrganizationUserServiceImpl extends SuperService {
             return ResultContent.buildFail(userAccountContent.getMsg());
         }
         String userId = userAccountContent.getContent();
-        UserAccount userAccount = userCountDao.findTopByUserId(userId);
 
         OrgBindUserAllParam orgBindUserAllParam = new OrgBindUserAllParam();
         orgBindUserAllParam.setId(param.getId());
-        orgBindUserAllParam.setUserId(userAccount.getUserId());
+        orgBindUserAllParam.setUserId(userId);
         orgBindUserAllParam.setOrgOid(organization.getOid());
         if (temp != null && temp.getOrganization() != null) {
             orgBindUserAllParam.setOrgOid(temp.getOrganization().getOid());
@@ -137,6 +136,7 @@ public class OrganizationUserServiceImpl extends SuperService {
         orgBindUserAllParam.setState(param.getState());
         orgBindUserAllParam.setIsAdmin(param.getIsAdmin());
 
+        // 绑定用户到机构
         ResultContent<OrganizationUser> bindUserContent = orgBindUser(orgBindUserAllParam);
         if (bindUserContent.isFailed()) {
             return ResultContent.buildFail(bindUserContent.getMsg());
@@ -147,7 +147,7 @@ public class OrganizationUserServiceImpl extends SuperService {
     }
 
     /**
-     * 结构绑定用户 （角色、部门、职位都以新的为准）
+     * 机构绑定用户 （角色、部门、职位都以新的为准）
      * 用户基本信息已存在
      *
      * @param param

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/ProjectBindOrgServiceImpl.java

@@ -6,7 +6,6 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationRelationSearch;
-import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.orgModel.ProjectBindOrgModel;
 import com.zhongshu.card.client.model.orgModel.ProjectBindOrgParam;
 import com.zhongshu.card.client.type.OrganizationRelationType;
@@ -15,7 +14,7 @@ import com.zhongshu.card.server.core.dao.org.OrganizationRelationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.PayShareListDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
-import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
+import com.zhongshu.card.server.core.domain.paySetting.PayShareList;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.projectAbout.PayShareListService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;

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

@@ -1,15 +1,16 @@
-package com.zhongshu.card.server.core.service.projectAbout;
+package com.zhongshu.card.server.core.service.paySetting;
 
 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.types.payment.PaymentChannelType;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigModel;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigParam;
 import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
 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.org.Organization;
-import com.zhongshu.card.server.core.domain.projectAbout.PayChannelConfig;
+import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -70,6 +71,7 @@ public class ProjectChannelConfigService extends SuperService {
             entity.setIsDelete(Boolean.FALSE);
             initEntityNoOid(entity);
         }
+
         BeanUtils.copyProperties(param, entity);
         entity.setProjectInfo(projectInfo);
         entity.setProjectName(projectInfo.getName());
@@ -91,11 +93,16 @@ public class ProjectChannelConfigService extends SuperService {
      */
     public ResultContent<Page<PayChannelConfigModel>> page(PayChannelConfigSearch param, Pageable pageable) {
         initSearchParamCheckProjectOid(param);
-
         Page<PayChannelConfig> page = payChannelConfigDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }
 
+    /**
+     * 删除数据
+     *
+     * @param id
+     * @return
+     */
     public ResultContent deleteData(String id) {
         PayChannelConfig entity = payChannelConfigDao.findTopById(id);
         if (ObjectUtils.isEmpty(entity)) {
@@ -105,6 +112,12 @@ public class ProjectChannelConfigService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 数据详情
+     *
+     * @param id
+     * @return
+     */
     public ResultContent getDetail(String id) {
         PayChannelConfig entity = payChannelConfigDao.findTopById(id);
         if (ObjectUtils.isEmpty(entity)) {
@@ -113,6 +126,11 @@ public class ProjectChannelConfigService extends SuperService {
         return ResultContent.buildSuccess(toModel(entity));
     }
 
+    public PayChannelConfig getProjectPayChannel(String projectOid, PaymentChannelType paymentChannelType) {
+        PayChannelConfig entity = payChannelConfigDao.findTopByProjectOidAndPaymentChannelType(projectOid, paymentChannelType);
+        return entity;
+    }
+
     public PayChannelConfigModel toModel(PayChannelConfig entity) {
         PayChannelConfigModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {

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

@@ -1,9 +1,9 @@
-package com.zhongshu.card.server.core.service.projectAbout;
+package com.zhongshu.card.server.core.service.paySetting;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.projectAbout.paySetting.*;
+import com.zhongshu.card.client.model.paySetting.paySetting.*;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.ProjectPaySettingDao;

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

@@ -0,0 +1,40 @@
+package com.zhongshu.card.server.core.service.paySetting;
+
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.server.core.dao.projectAbout.UnionFrictionlessSettingDao;
+import com.zhongshu.card.server.core.domain.base.SuperMain;
+import com.zhongshu.card.server.core.domain.paySetting.UnionFrictionlessSetting;
+import com.zhongshu.card.server.core.service.base.SuperService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目的无感支付设置
+ *
+ * @author TRX
+ * @date 2024/10/9
+ */
+@Slf4j
+@Service
+public class UnionFrictionlessSettingService extends SuperService {
+
+    @Autowired
+    private UnionFrictionlessSettingDao unionFrictionlessSettingDao;
+
+    @Autowired
+    private ProjectChannelConfigService projectChannelConfigService;
+
+    /**
+     * 保存数据
+     *
+     * @param param
+     * @return
+     */
+    public ResultContent saveInfo(UnionFrictionlessSetting param) {
+
+
+        return ResultContent.buildSuccess();
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/SignatureServiceImpl.java

@@ -1,150 +0,0 @@
-package com.zhongshu.card.server.core.service.payment;
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.github.microservice.auth.client.content.ResultContent;
-import com.github.microservice.auth.client.content.ResultState;
-import com.zhongshu.card.client.model.dahua.PicUploadRequestModel;
-import com.zhongshu.card.client.model.dahua.PicUploadResponseModel;
-import com.zhongshu.card.client.model.payment.BaseModel;
-import com.zhongshu.card.client.model.payment.ComplexModel;
-import com.zhongshu.card.client.model.payment.PicUpModel;
-import com.zhongshu.card.client.model.payment.RegmerTypeModel;
-import com.zhongshu.card.client.service.payment.SignatureService;
-import com.zhongshu.card.client.type.payment.PicType;
-import com.zhongshu.card.server.core.dao.payment.ComplexDao;
-import com.zhongshu.card.server.core.dao.payment.PicDao;
-import com.zhongshu.card.server.core.domain.payment.Complex;
-import com.zhongshu.card.server.core.domain.payment.Pic;
-import com.zhongshu.card.server.core.service.base.SuperService;
-import com.zhongshu.card.server.core.util.CustomBeanUtils;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-
-/**
- * @author TRX
- * @date 2024/6/19
- */
-@Slf4j
-@Service
-public class SignatureServiceImpl extends SuperService implements SignatureService {
-
-    @Autowired
-    PicDao picDao;
-
-    @Autowired
-    ComplexDao complexDao;
-
-    @Transactional
-    public ResultContent<Complex> startComplex(RegmerTypeModel typeModel) {
-        String accesseId = typeModel.getAccesseId();
-        if (ObjectUtil.isEmpty(accesseId)) {
-            return ResultContent.build(ResultState.Success, newComplex(typeModel));
-        }
-        Complex complex = findComplex(typeModel);
-        if (ObjectUtil.isEmpty(complex) || !complex.getReg_mer_type().equals(typeModel.getReg_mer_type())) {
-            picDao.deleteByAccesserId(accesseId);
-            complexDao.deleteByAccesser_user_id(accesseId);
-
-            return ResultContent.build(ResultState.Success, newComplex(typeModel));
-        }
-        return ResultContent.build(ResultState.Success, complex);
-    }
-
-    /**
-     * 查询正在进行的流程
-     *
-     * @return
-     */
-    public ResultContent<ComplexModel> complexIng(BaseModel baseModel) {
-        String accesseId = baseModel.getAccesseId();
-
-        Complex complex = findComplex(baseModel);
-        ArrayList<PicUpModel> picUpModels = new ArrayList<>();
-
-        picDao.findAllByAccesserId(accesseId).forEach(it -> {
-            PicUpModel picUpModel = new PicUpModel();
-            CustomBeanUtils.copyPropertiesIgnoreNull(it, picUpModel);
-            picUpModels.add(picUpModel);
-        });
-
-        ComplexModel complexModel = new ComplexModel();
-        CustomBeanUtils.copyPropertiesIgnoreNull(complex, complexModel);
-        complexModel.setPic_list(picUpModels);
-        return ResultContent.build(ResultState.Success, complexModel);
-    }
-
-    /**
-     * 上传图片
-     *
-     * @param picUpModel
-     * @return
-     */
-    public ResultContent picUpload(PicUpModel picUpModel) {
-        String accesseId = picUpModel.getAccesseId();
-        String base64 = imageToBase64(picUpModel.getFileUrl());
-
-        PicUploadRequestModel picUploadModel = new PicUploadRequestModel();
-        picUploadModel.setPic_base64(base64);
-        PicUploadResponseModel picUploadResponseModel = null;
-//        PicUploadResponseModel picUploadResponseModel = daHuaApi.picUpload(picUploadModel);
-        PicType picType = picUpModel.getPicType();
-        Pic pic = picDao.findByAccesserIdAndDocument_type(accesseId, picType.getDocument_type());
-        if (ObjectUtil.isEmpty(pic)) {
-
-            Pic newPic = new Pic();
-            CustomBeanUtils.copyPropertiesIgnoreNull(picUploadResponseModel, newPic);
-            CustomBeanUtils.copyPropertiesIgnoreNull(picUpModel, newPic);
-            newPic.setEpId(picUpModel.getOid());
-            newPic.setAccesserId(accesseId);
-            newPic.setDocument_type(picType.getDocument_type());
-            newPic.setDocument_name(picType.getName());
-            picDao.save(newPic);
-            return ResultContent.build(ResultState.Success);
-        } else {
-//            pic.setEpId(pic.getEpId());
-//            pic.setAccesserId(accesseId);
-            CustomBeanUtils.copyPropertiesIgnoreNull(picUploadResponseModel, pic);
-            CustomBeanUtils.copyPropertiesIgnoreNull(picUpModel, pic);
-            picDao.save(pic);
-            return ResultContent.build(ResultState.Success);
-        }
-    }
-
-    private Complex findComplex(BaseModel baseModel) {
-        Complex complex = complexDao.findByAccesser_user_idAndEpId(baseModel.getAccesseId(), baseModel.getOid());
-        Assert.isTrue(null != complex, "申请流程不存在");
-        return complex;
-    }
-
-    private Complex newComplex(RegmerTypeModel typeModel) {
-        String newAccesseId = IdUtil.fastSimpleUUID();
-        Complex newComplex = new Complex();
-        newComplex.setEpId(typeModel.getOid());
-        newComplex.setAccesser_user_id(newAccesseId);
-        newComplex.setReg_mer_type(typeModel.getReg_mer_type());
-        return complexDao.save(newComplex);
-    }
-
-    @SneakyThrows
-    private String imageToBase64(String urlIm) {
-        String imgType = urlIm.substring(urlIm.lastIndexOf(".") + 1, urlIm.length());
-        URL url = new URL(urlIm);
-        InputStream inputStream = url.openStream();
-        byte[] bytes = IoUtil.readBytes(inputStream);
-        String imgBase64Head = "data:image/" + imgType + ";base64,";
-        String body = Base64.encode(bytes);
-        return imgBase64Head + body;
-    }
-
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/PayShareListService.java

@@ -1,9 +1,8 @@
 package com.zhongshu.card.server.core.service.projectAbout;
 
-import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.projectAbout.PayShareListModel;
 import com.zhongshu.card.server.core.dao.projectAbout.PayShareListDao;
-import com.zhongshu.card.server.core.domain.projectAbout.PayShareList;
+import com.zhongshu.card.server.core.domain.paySetting.PayShareList;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import lombok.Data;
 import org.apache.commons.lang3.ObjectUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/ProjectExcelTemplateService.java

@@ -24,7 +24,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 /**
- * 项目的 关联的物联网 ak sk 设置
+ * 项目的 关联的excel模型
  *
  * @author TRX
  * @date 2024/9/24