好办后台接口参数修改

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.*;
@@ -78,6 +80,8 @@ public class WxEnterpriseController extends WebBaseController {
     private HaobanQywxFeeApiService haobanQywxFeeApiService;
     @Autowired
     private SecretSettingApiService secretSettingApiService ;
+    @Autowired
+    private ClerkService clerkService;
 
     //授权企业列表
     @RequestMapping("wxa-enterprise-list")
@@ -211,18 +215,24 @@ public class WxEnterpriseController extends WebBaseController {
     //gic企业列表
     @IgnoreLogin
     @RequestMapping("enterprise-search")
-    public HaobanResponse gicEnterpriseDetail(String enterpriseName) {
-        if (StringUtils.isEmpty(enterpriseName)) {
+    public HaobanResponse gicEnterpriseDetail(String enterpriseId) {
+        if (org.apache.commons.lang.StringUtils.isEmpty(enterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
-        EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseName);
-        EnterpriseSearchVO vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
-        if (vo != null) {
-            String enterpriseId = vo.getEnterpriseId();
-            EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-            if (enterprise != null) {
-                vo.setBrandName(enterprise.getBrandName());
-            }
+        EnterpriseSearchVO vo = new EnterpriseSearchVO();
+        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
+        if (enterprise != null) {
+            vo.setEnterpriseId(enterpriseId);
+            vo.setEnterpriseName(enterprise.getEnterpriseName());
+            vo.setBrandName(enterprise.getBrandName());
+        }
+        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+        if (clerk != null) {
+            vo.setClerkId(clerk.getClerkId());
+            vo.setClerkCode(clerk.getClerkCode());
+            vo.setClerkName(clerk.getClerkName());
+            vo.setPhoneNumber(clerk.getPhoneNumber());
+            vo.setNationCode(clerk.getNationcode());
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }