更新

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

@@ -17,6 +17,9 @@ public class WxPayConfigModel {
     @Schema(description = "项目id")
     private String projectOid;
 
+    @Schema(description = "项目名称")
+    private String projectName;
+
     @Schema(description = "appid")
     private String appId;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/OrganizationFeignService.java

@@ -0,0 +1,33 @@
+package com.zhongshu.card.client.service;
+
+import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
+import com.zhongshu.card.client.model.org.OrganizationModel;
+import com.zhongshu.card.client.model.org.ProjectOrgModel;
+import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.ret.ResultContent;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import org.springframework.cloud.openfeign.FeignClient;
+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.RequestParam;
+
+
+@FeignClient(name = "fullcardserver-trx/organizationFeign/manager")
+public interface OrganizationFeignService {
+
+    @Operation(summary = "得到项目信息", description = "得到项目信息")
+    @RequestMapping(value = "getProjectInfo", method = RequestMethod.GET)
+    ResultContent<ProjectOrgModel> getProjectInfo(@Parameter(name = "projectOid", description = "oid", required = false) @RequestParam(name = "projectOid") String projectOid);
+
+    @Operation(summary = "得到学校详情", description = "得到学校详情")
+    @RequestMapping(value = "getSchoolDetail", method = RequestMethod.GET)
+    ResultContent<OrganizationModel> getSchoolDetail(@Parameter(name = "schoolOid", description = "oid", required = false) @RequestParam(name = "schoolOid") String schoolOid);
+
+
+    @Operation(summary = "得到商户详情", description = "得到商户详情")
+    @RequestMapping(value = "getBusinessMainDetail", method = RequestMethod.GET)
+    ResultContent<OrganizationModel> getBusinessMainDetail(@Parameter(name = "businessMainOid", description = "oid", required = false) @RequestParam(name = "businessMainOid") String businessMainOid);
+
+}

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

@@ -1,19 +1,18 @@
 package com.zhongshu.card.client.service;
 
-import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.*;
 import com.zhongshu.card.client.ret.ResultContent;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 
 public interface ProjectPaySettingService {
 
-    @Operation(summary = "项目关联的微信支付配置", description = "项目关联的微信支付配置")
+    /**
+     * 项目关联的微信支付配置
+     *
+     * @param param
+     * @return
+     */
     ResultContent<WxPayConfigModel> getProjectWxPayConfig(ProjectWxPayParam param);
 
     ResultContent setProjectPaySetting(ProjectPaySettingParam param);

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -53,6 +53,15 @@ public interface OrganizationService {
     // 查询结构详情
     public ResultContent<OrganizationModel> getDetail(String oid);
 
+    // 得到项目的信息
+    ResultContent<ProjectOrgModel> getProjectDetail(String projectOid);
+
+    // 得到学校详情
+    ResultContent<OrganizationModel> getSchoolDetail(String schoolOid);
+
+    // 得到商户详情
+    ResultContent<OrganizationModel> getBusinessMainDetail(String businessMainOid);
+
     public ResultContent deleteOrganization(String oid);
 
     public ResultContent<List<OrganizationSimpleModel>> list(OrganizationSearchParam param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/OrganizationFeignController.java

@@ -3,18 +3,18 @@ package com.zhongshu.card.server.core.controller.feign;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
+import com.zhongshu.card.client.model.org.OrganizationModel;
+import com.zhongshu.card.client.model.org.ProjectOrgModel;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import io.swagger.v3.oas.annotations.Hidden;
 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.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 org.springframework.web.bind.annotation.*;
 
 /**
  * @author TRX
@@ -29,11 +29,32 @@ public class OrganizationFeignController {
     @Autowired
     OrganizationService organizationService;
 
-    @Operation(summary = "项目关联的微信支付配置", description = "项目关联的微信支付配置")
-    @RequestMapping(value = "manager/getProjectWxPayConfig", method = {RequestMethod.POST})
-    public ResultContent<ProjectWxPayModel> getProjectWxPayConfig(@RequestBody ProjectWxPayParam param) {
-        ProjectWxPayModel model = new ProjectWxPayModel();
-        model.setAppId(param.getAppId());
-        return ResultContent.buildSuccess(model);
+    @Operation(summary = "得到项目信息", description = "得到项目信息")
+    @RequestMapping(value = "manager/getProjectInfo", method = {RequestMethod.GET})
+    public ResultContent<ProjectOrgModel> getProjectInfo(
+            @Parameter(name = "projectOid", description = "oid", required = false)
+            @RequestParam(name = "projectOid")
+            String projectOid) {
+        return organizationService.getProjectDetail(projectOid);
     }
+
+    @Operation(summary = "得到学校详情", description = "得到学校详情")
+    @RequestMapping(value = "manager/getSchoolDetail", method = {RequestMethod.GET})
+    public ResultContent<OrganizationModel> getSchoolDetail(
+            @Parameter(name = "schoolOid", description = "oid", required = false)
+            @RequestParam(name = "schoolOid")
+            String schoolOid) {
+        return organizationService.getSchoolDetail(schoolOid);
+    }
+
+    @Operation(summary = "得到商户详情", description = "得到商户详情")
+    @RequestMapping(value = "manager/getBusinessMainDetail", method = {RequestMethod.GET})
+    public ResultContent<OrganizationModel> getBusinessMainDetail(
+            @Parameter(name = "businessMainOid", description = "oid", required = false)
+            @RequestParam(name = "businessMainOid")
+            String businessMainOid) {
+        return organizationService.getBusinessMainDetail(businessMainOid);
+    }
+
+
 }

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

@@ -384,6 +384,54 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         return ResultContent.buildSuccess(model);
     }
 
+    /**
+     * 得到项目详情
+     *
+     * @param projectOid
+     * @return
+     */
+    @Override
+    public ResultContent<ProjectOrgModel> getProjectDetail(String projectOid) {
+        Organization organization = organizationDao.findTopByOid(projectOid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, projectOid));
+        }
+        OrganizationModel model = toProjectModel(organization);
+        return ResultContent.buildSuccess(model);
+    }
+
+    /**
+     * 得到学校详情
+     *
+     * @param schoolOid
+     * @return
+     */
+    @Override
+    public ResultContent<OrganizationModel> getSchoolDetail(String schoolOid) {
+        Organization organization = organizationDao.findTopByOid(schoolOid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, schoolOid));
+        }
+        OrganizationModel model = toModel(organization);
+        return ResultContent.buildSuccess(model);
+    }
+
+    /**
+     * 得到商户信息
+     *
+     * @param businessMainOid
+     * @return
+     */
+    @Override
+    public ResultContent<OrganizationModel> getBusinessMainDetail(String businessMainOid) {
+        Organization organization = organizationDao.findTopByOid(businessMainOid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, businessMainOid));
+        }
+        OrganizationModel model = toModel(organization);
+        return ResultContent.buildSuccess(model);
+    }
+
     /**
      * 分页数据
      *

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

@@ -140,6 +140,10 @@ public class ProjectPaySettingServiceImpl extends SuperService implements Projec
         if (ObjectUtils.isNotEmpty(entity)) {
             model = new WxPayConfigModel();
             BeanUtils.copyProperties(entity, model);
+            Organization projectOrg = organizationDao.findTopByOid(entity.getProjectOid());
+            if (ObjectUtils.isNotEmpty(projectOrg)) {
+                model.setProjectName(projectOrg.getName());
+            }
         }
         return model;
     }