cs

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationModel.java

@@ -65,6 +65,7 @@ public class OrganizationModel extends SuperModel {
     @Schema(description = "状态")
     private OrganizationState state;
 
+    @Schema(description = "状态显示")
     private String stateStr;
 
     public String getStateStr() {

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

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.projectAbout.payConfig;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 直营 支付宝支付的配置
+ *
+ * @author TRX
+ * @date 2024/9/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DirectPayAliPayConfig {
+
+    private String appId;
+
+}

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

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.projectAbout.payConfig;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 直营 微信支付的配置
+ *
+ * @author TRX
+ * @date 2024/9/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DirectPayWeChatConfig {
+
+    private String appId;
+
+}

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

@@ -0,0 +1,73 @@
+package com.zhongshu.card.client.model.projectAbout.payConfig;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 项目的  银联无感支付的配置  银联配置
+ *
+ * @author TRX
+ * @date 2024/9/25
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FrictionlessUnionConfig {
+
+    //----------------------------业务信息 start-----------------
+
+    @Schema(description = "商户号")
+    private String mid;
+
+    @Schema(description = "无感支付签约状态通知地址")
+    private String notifyUrl = "";
+
+    @Schema(description = "支付结果通知地址")
+    private String payNotifyUrl = "";
+
+    @Schema(description = "无感支付 秘钥 测试环境通知加密密钥")
+    private String notifySecret;
+
+    @Schema(description = "银联分配的appId")
+    private String appId;
+
+    @Schema(description = "银联分配的appKey")
+    private String appKey;
+
+    @Schema(description = "终端号")
+    private String tid;
+
+    @Schema(description = "银联无感支付签约模板ID")
+    private String planId;
+
+    @Schema(description = "来源编号")
+    private String msgSrcId;
+
+    @Schema(description = "签约结束后调整小程序id")
+    private String mchntWxMpAppId;
+
+    @Schema(description = "订单交易过期时间")
+    private Long expireTime = 30 * 60 * 1000L;
+
+    //-------------------------提现 参数配置 start ------------------
+
+    @Schema(description = "悦融益提现 appId")
+    private String withdrawAppId = "";
+
+    @Schema(description = "悦融益提现 appKey")
+    private String withdrawAppKey = "";
+
+    @Schema(description = "悦融益提现 系统编号")
+    private String withdrawSysid = "";
+
+    @Schema(description = "悦融益提现 多应用类型")
+    private String withdrawAppType = "74";
+
+    @Schema(description = "悦融益提现 通知地址")
+    private String withdrawNotify;
+
+}

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

@@ -0,0 +1,24 @@
+package com.zhongshu.card.client.model.projectAbout.payConfig;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 项目的  无感支付 微信配置
+ *
+ * @author TRX
+ * @date 2024/9/25
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FrictionlessWeChatConfig {
+
+    @Schema(description = "小程序appId")
+    private String appId;
+
+}

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

@@ -0,0 +1,48 @@
+package com.zhongshu.card.client.model.projectAbout.payConfig;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 分账规则   提现规则
+ *
+ * @author TRX
+ * @date 2024/9/25
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PaySharingConfig {
+
+    //----------------------------分账规则配置 start -------------------
+
+    @Schema(description = "最小分账金额, 单位分")
+    private Long minSharing = 0L;
+
+    @Schema(description = "全局分账比例，0-100")
+    private BigDecimal projectScale = BigDecimal.ZERO;
+
+    @Schema(description = "机构分账比例，0-100")
+    private BigDecimal orgScale = BigDecimal.ZERO;
+
+    //------------------ 提现设置 start--------------
+
+    @Schema(description = "是否开启提现审核")
+    private Boolean isOpenWithdrawReView = Boolean.FALSE;
+
+    @Schema(description = "单笔提现最低提现金额")
+    private Long minWithdraw = 0L;
+
+    @Schema(description = "单笔提现最高提现金额")
+    private Long maxWithdraw = 0L;
+
+    @Schema(description = "单日提现额度")
+    private Long maxDayWithdraw = 0L;
+
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment.paySetting;
+package com.zhongshu.card.client.model.projectAbout.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/service/feign/ProjectPaySettingFeignService.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.client.service.feign;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.paySetting.*;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.projectAbout.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

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

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

@@ -3,8 +3,8 @@ package com.zhongshu.card.server.core.controller.projectAbout;
 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.zhongshu.card.client.model.payment.paySetting.*;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.projectAbout.paySetting.*;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/projectAbout/ProjectWeChatInfoController.java

@@ -5,10 +5,8 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.paySetting.*;
 import com.zhongshu.card.client.model.projectAbout.ProjectWeChatInfoModel;
 import com.zhongshu.card.client.model.projectAbout.ProjectWeChatInfoParam;
-import com.zhongshu.card.client.service.feign.ProjectPaySettingService;
 import com.zhongshu.card.server.core.service.projectAbout.ProjectWeChatInfoService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/IndexController.java

@@ -6,6 +6,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultState;
 import com.zhongshu.card.client.model.base.ReTokenParam;
+import com.zhongshu.card.client.model.login.LoginCommonModel;
 import com.zhongshu.card.client.model.org.GetPhoneModel;
 import com.zhongshu.card.client.model.org.LoginParam;
 import com.zhongshu.card.client.model.org.LoginPlatformTokenModel;
@@ -53,9 +54,9 @@ public class IndexController {
     @RequestMapping(value = "commonLogin", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResultContent commonLogin(@RequestBody LoginParam param, HttpServletRequest request, HttpServletResponse response) {
         param.setLoginFromType(LoginFromType.Platform);
-        ResultContent result = indexService.commonLogin(param);
+        ResultContent result = indexService.commonAllLogin(param);
         if (result.isSuccess()) {
-            LoginPlatformTokenModel tokenModel = (LoginPlatformTokenModel) result.getContent();
+            LoginCommonModel tokenModel = (LoginCommonModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccess_token());
             Cookie cookie = new Cookie("accessToken", tokenModel.getAccess_token());
             cookie.setMaxAge(60 * 60 * 24 * 3);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserInfoController.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserInfoController.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.controller.org;
+package com.zhongshu.card.server.core.controller.user;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserManagerController.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserManagerController.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.controller.org;
+package com.zhongshu.card.server.core.controller.user;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;

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

@@ -1,11 +1,7 @@
 package com.zhongshu.card.server.core.dao.payment;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.server.core.dao.payment.extend.ComplexDaoExtend;
-import com.zhongshu.card.server.core.domain.payment.Complex;
-import com.zhongshu.card.server.core.domain.payment.WxPayConfig;
-
-import java.util.List;
+import com.zhongshu.card.server.core.domain.projectAbout.WxPayConfig;
 
 public interface WxPayConfigDao extends MongoDao<WxPayConfig> {
 

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

@@ -0,0 +1,49 @@
+package com.zhongshu.card.server.core.domain.projectAbout;
+
+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;
+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 DirectPaySetting extends SuperMain {
+
+    @Schema(description = "项目信息")
+    @DBRef(lazy = true)
+    private Organization projectInfo;
+
+    @Schema(description = "项目名称")
+    private String projectName;
+
+    @Schema(description = "项目编码")
+    private String projectCode;
+
+    @Schema(description = "是否开启微信支付")
+    private Boolean isOpenWeChat = Boolean.FALSE;
+
+    private DirectPayWeChatConfig weChatConfig;
+
+    @Schema(description = "是否开启支付宝支付")
+    private Boolean isOpenAliPay = Boolean.FALSE;
+
+    @Schema(description = "支付宝配置")
+    private DirectPayAliPayConfig aliPayConfig;
+
+}

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

@@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
- * 项目的支付设置
+ * 项目的支付设置 主设置
  *
  * @author TRX
  * @date 2024/7/26
@@ -34,7 +34,10 @@ public class ProjectPaySetting extends SuperMain {
     @Schema(description = "项目编码")
     private String projectCode;
 
+    //----------------------------------业务数据 -------------------
     @Schema(description = "项目的支付渠道设置：微信支付、银联支付")
     private PaymentType channelType;
 
+
+
 }

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

@@ -0,0 +1,56 @@
+package com.zhongshu.card.server.core.domain.projectAbout;
+
+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.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 UnionFrictionlessSetting extends SuperMain {
+
+    @Schema(description = "项目信息")
+    @DBRef(lazy = true)
+    private Organization projectInfo;
+
+    @Schema(description = "项目名称")
+    private String projectName;
+
+    @Schema(description = "项目编码")
+    private String projectCode;
+
+    //----------------------------业务信息 start-----------------
+
+    @Schema(description = "是否开启银联无感支付")
+    private Boolean isOpenUnionFrictionless = Boolean.FALSE;
+
+    @Schema(description = "银联的无感支付 参数配置")
+    private FrictionlessUnionConfig frictionlessUnionConfig;
+
+    @Schema(description = "打开无感支付 - 微信授权支付")
+    private Boolean isOpenWeChatFrictionlessConfig = Boolean.FALSE;
+
+    @Schema(description = "无感支付--微信关联数据")
+    private FrictionlessWeChatConfig frictionlessWeChatConfig;
+
+    @Schema(description = "分账规则")
+    private PaySharingConfig paySharingConfig;
+
+}

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

@@ -0,0 +1,45 @@
+package com.zhongshu.card.server.core.domain.projectAbout;
+
+import com.zhongshu.card.client.model.projectAbout.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/payment/WxPayConfig.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/WxPayConfig.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.payment;
+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;
@@ -25,22 +25,22 @@ public class WxPayConfig extends SuperMain {
     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;

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

@@ -31,6 +31,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StopWatch;
 
 import java.util.*;
 
@@ -96,14 +97,17 @@ public class IndexService {
      * @param param
      * @return
      */
-    public ResultContent commonLogin(LoginParam param) {
+    public ResultContent<LoginCommonModel> commonAllLogin(LoginParam param) {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start("1");
+
         String phone = param.getLoginValue();
         UserAuthLoginModel userAuthLoginModel = new UserAuthLoginModel();
         BeanUtils.copyProperties(param, userAuthLoginModel);
         // 登录
         ResultContent<LoginTokenModel> resultContent = commonLogin(userAuthLoginModel);
         if (resultContent.isFailed()) {
-            return resultContent;
+            return ResultContent.buildFail(resultContent.getMsg());
         }
         Organization organization = organizationDao.findTopByAuthType(AuthType.Platform);
         if (ObjectUtils.isEmpty(organization)) {
@@ -113,6 +117,9 @@ public class IndexService {
         LoginCommonModel commonModel = new LoginCommonModel();
         LoginTokenModel loginTokenModel = resultContent.getContent();
         com.zhongshu.card.server.core.util.BeanUtils.copyProperties(loginTokenModel, commonModel);
+        stopWatch.stop();
+
+        stopWatch.start("2");
 
         UserAccount userAccount = userCountDao.findTopByLoginName(phone);
         UserCountModel userCountModel = userAccountService.toModel(userAccount);
@@ -121,10 +128,14 @@ public class IndexService {
         // 平台信息
         commonModel.setPlatformOid(organization.getOid());
         commonModel.setPlatformInfo(organizationService.toSimpleModel(organization));
+        stopWatch.stop();
 
+        stopWatch.start("3");
         // 用户所有的权限
-        Set<String> auth = new HashSet<>();
+        Set<String> auth = roleServiceImpl.getUserAllAuths(userAccount.getUserId());
         commonModel.setAuths(auth);
+        stopWatch.stop();
+        log.info(stopWatch.prettyPrint());
 
         return ResultContent.buildSuccess(commonModel);
     }

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

@@ -2,15 +2,15 @@ package com.zhongshu.card.server.core.service.projectAbout;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.paySetting.*;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.projectAbout.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;
 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.projectAbout.ProjectPaySetting;
-import com.zhongshu.card.server.core.domain.payment.WxPayConfig;
+import com.zhongshu.card.server.core.domain.projectAbout.WxPayConfig;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +45,8 @@ public class ProjectPaySettingServiceImpl extends SuperService implements Projec
      */
     @Override
     public ResultContent setProjectPaySetting(ProjectPaySettingParam param) {
+        String projectOid = param.getProjectOid();
+        // 项目信息
         Organization projectOrg = organizationDao.findTopByOid(param.getProjectOid());
         if (ObjectUtils.isEmpty(projectOrg)) {
             return ResultContent.buildFail(String.format("oid不存在:%s", param.getProjectOid()));
@@ -57,8 +59,15 @@ public class ProjectPaySettingServiceImpl extends SuperService implements Projec
             setting = new ProjectPaySetting();
         }
         BeanUtils.copyProperties(param, setting);
+        setting.setProjectInfo(projectOrg);
         setting.setProjectName(projectOrg.getName());
         setting.setProjectCode(projectOrg.getCode());
+        setting.setProjectOid(projectOrg.getOid());
+
+        setting.setOid(projectOid);
+        setting.setAboutOid(projectOid);
+        setting.setAboutAuthType(projectOrg.getAuthType());
+
         projectPaySettingDao.save(setting);
         return ResultContent.buildSuccess();
     }