更新

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

@@ -1,10 +1,7 @@
 package com.zhongshu.card.client.service;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.org.OrgUserDetailParam;
-import com.zhongshu.card.client.model.org.OrganizationModel;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
-import com.zhongshu.card.client.model.org.ProjectOrgModel;
+import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +24,6 @@ public interface OrganizationFeignService {
     @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);
@@ -41,4 +37,11 @@ public interface OrganizationFeignService {
     @RequestMapping(value = "getOrgUserDetail", method = {RequestMethod.POST})
     public ResultContent<OrganizationUserModel> getOrgUserDetail(@RequestBody OrgUserDetailParam param);
 
+    @Operation(summary = "oid类型判断和关联的 项目oid、学校oid、商户oid", description = "oid类型判断和关联的 项目oid、学校oid、商户oid")
+    @RequestMapping(value = "getOidAboutOrgInfo", method = RequestMethod.GET)
+    ResultContent<OidAboutInfo> getOidAboutOrgInfo(
+            @Parameter(name = "oid", description = "oid", required = false)
+            @RequestParam(name = "oid") String oid);
+
+
 }

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

@@ -23,7 +23,7 @@ public interface OrganizationService {
      * @param param
      * @return
      */
-    public ResultContent addOrganization(OrganizationAddParam param);
+    ResultContent addOrganization(OrganizationAddParam param);
 
     /**
      * 编辑项目
@@ -39,10 +39,10 @@ public interface OrganizationService {
      * @param param
      * @return
      */
-    public ResultContent update(OrganizationUpdateParam param);
+    ResultContent update(OrganizationUpdateParam param);
 
     // 添加学校
-    public ResultContent addSchool(SchoolAddParam param);
+    ResultContent addSchool(SchoolAddParam param);
 
     // 得到平台管理端的数据
     ResultContent<OrganizationModel> getPlatformInfo();
@@ -51,7 +51,7 @@ public interface OrganizationService {
     ResultContent updateSchool(SchoolUpdateParam param);
 
     // 查询结构详情
-    public ResultContent<OrganizationModel> getDetail(String oid);
+    ResultContent<OrganizationModel> getDetail(String oid);
 
     // 得到项目的信息
     ResultContent<ProjectOrgModel> getProjectDetail(String projectOid);
@@ -66,25 +66,26 @@ public interface OrganizationService {
     ResultContent<OrganizationModel> getBusinessMainDetail(String businessMainOid);
 
     // 删除机构信息
-    public ResultContent deleteOrganization(String oid);
+    ResultContent deleteOrganization(String oid);
 
     // 得到oid关联的结构信息
-    OidAboutInfo getOidAboutProjectInfo(String oid);
+    OidAboutInfo getOidAboutOrgInfo(String oid);
 
-    public ResultContent<List<OrganizationSimpleModel>> list(OrganizationSearchParam param);
+    ResultContent<List<OrganizationSimpleModel>> list(OrganizationSearchParam param);
 
-    public ResultContent<Page<OrganizationModel>> page(OrganizationSearchParam param, Pageable pageable);
+    ResultContent<Page<OrganizationModel>> page(OrganizationSearchParam param, Pageable pageable);
 
     ResultContent<OrganizationModel> getOrgDetail(String oid);
 
-    public ResultContent<Page<OrganizationModel>> pageProject(OrganizationSearchParam param, Pageable pageable);
+    ResultContent<Page<OrganizationModel>> pageProject(OrganizationSearchParam param, Pageable pageable);
 
     // 查询可用的项目列表
     ResultContent<List<OrganizationModel>> getProjectList();
 
-    public ResultContent<List<OrganizationModel>> getUserOrgList(OrganizationUserSearch param);
+    ResultContent<List<OrganizationModel>> getUserOrgList(OrganizationUserSearch param);
 
-    public ResultContent buildCode(AuthType authType);
+    ResultContent buildCode(AuthType authType);
 
     ResultContent initSuperOrganization();
+
 }

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

@@ -3,10 +3,7 @@ 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.OrgUserDetailParam;
-import com.zhongshu.card.client.model.org.OrganizationModel;
-import com.zhongshu.card.client.model.org.OrganizationUserModel;
-import com.zhongshu.card.client.model.org.ProjectOrgModel;
+import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
@@ -77,4 +74,13 @@ public class OrganizationFeignController {
         return userAccountService.getOrgUserDetail(param);
     }
 
+    @Operation(summary = "oid类型判断和关联的 项目oid、学校oid、商户oid", description = "oid类型判断和关联的 项目oid、学校oid、商户oid")
+    @RequestMapping(value = "manager/getOidAboutOrgInfo", method = {RequestMethod.GET})
+    public ResultContent<OidAboutInfo> getOidAboutOrgInfo(
+            @Parameter(name = "oid", description = "oid", required = false)
+            @RequestParam(name = "oid") String oid) {
+        OidAboutInfo oidAboutInfo = organizationService.getOidAboutOrgInfo(oid);
+        return ResultContent.buildSuccess(oidAboutInfo);
+    }
+
 }

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

@@ -458,7 +458,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
      * @param oid
      * @return
      */
-    public OidAboutInfo getOidAboutProjectInfo(String oid) {
+    public OidAboutInfo getOidAboutOrgInfo(String oid) {
         OidAboutInfo aboutInfo = new OidAboutInfo();
         if (StringUtils.isNotEmpty(oid)) {
             aboutInfo.setOid(oid);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoPoolService.java

@@ -62,7 +62,7 @@ public class CardInfoPoolService extends SuperService {
         // 这是学校的oid
         String oid = param.getOid();
 
-        OidAboutInfo oidAboutInfo = organizationService.getOidAboutProjectInfo(oid);
+        OidAboutInfo oidAboutInfo = organizationService.getOidAboutOrgInfo(oid);
 
         String projectOid = oidAboutInfo.getProjectOid();
         String schoolOid = oidAboutInfo.getSchoolOid();
@@ -164,7 +164,7 @@ public class CardInfoPoolService extends SuperService {
         String oid = getCurrentOid();
         Assert.hasText(oid, "oid不能为空");
 
-        OidAboutInfo oidAboutInfo = organizationService.getOidAboutProjectInfo(oid);
+        OidAboutInfo oidAboutInfo = organizationService.getOidAboutOrgInfo(oid);
 
         String projectOid = oidAboutInfo.getProjectOid();
         String schoolOid = oidAboutInfo.getSchoolOid();