TRX 1 год назад
Родитель
Сommit
b0d8fcfd53

+ 1 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrgUserDetailParam.java

@@ -14,6 +14,6 @@ public class OrgUserDetailParam {
     @Schema(description = "用户UserId")
     private String userId;
 
-    @Schema(description = "机构ID", hidden = true)
+    @Schema(description = "机构Oid", hidden = true)
     private String oid;
 }

+ 5 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/service/OrganizationFeignService.java

@@ -1,7 +1,9 @@
 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.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.ret.ResultContent;
@@ -35,5 +37,8 @@ public interface OrganizationFeignService {
     @RequestMapping(value = "getSchoolProjectDetail", method = RequestMethod.GET)
     ResultContent<OrganizationModel> getSchoolProjectDetail(@Parameter(name = "schoolOid", description = "oid", required = false) @RequestParam(name = "schoolOid") String schoolOid);
 
+    @Operation(summary = "得到用户在结构的信息", description = "得到用户在结构的信息")
+    @RequestMapping(value = "getOrgUserDetail", method = {RequestMethod.POST})
+    public ResultContent<OrganizationUserModel> getOrgUserDetail(@RequestBody OrgUserDetailParam param);
 
 }

+ 1 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -65,6 +65,7 @@ public interface OrganizationService {
     // 得到商户详情
     ResultContent<OrganizationModel> getBusinessMainDetail(String businessMainOid);
 
+    // 删除机构信息
     public ResultContent deleteOrganization(String oid);
 
     public ResultContent<List<OrganizationSimpleModel>> list(OrganizationSearchParam param);

+ 12 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/OrganizationFeignController.java

@@ -3,11 +3,14 @@ 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.payment.ExpenseFlowModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
+import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,6 +32,9 @@ public class OrganizationFeignController {
     @Autowired
     OrganizationService organizationService;
 
+    @Autowired
+    UserAccountService userAccountService;
+
     @Operation(summary = "得到项目信息", description = "得到项目信息")
     @RequestMapping(value = "manager/getProjectInfo", method = {RequestMethod.GET})
     public ResultContent<ProjectOrgModel> getProjectInfo(
@@ -65,4 +71,10 @@ public class OrganizationFeignController {
         return organizationService.getSchoolProjectDetail(schoolOid);
     }
 
+    @Operation(summary = "得到用户在结构的信息", description = "得到用户在结构的信息")
+    @RequestMapping(value = "manager/getOrgUserDetail", method = {RequestMethod.POST})
+    public ResultContent<OrganizationUserModel> getOrgUserDetail(@RequestBody OrgUserDetailParam param) {
+        return userAccountService.getOrgUserDetail(param);
+    }
+
 }