获取接口

suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java

@@ -1,14 +1,13 @@
 package com.dgtly.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
 
 import com.dgtly.common.core.domain.Ztree;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.ShiroSaltUtil;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
+import com.dgtly.sync.service.AnalysisDiyCustomerComponent;
 import com.dgtly.system.domain.*;
 import com.dgtly.system.service.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -54,6 +53,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysUserOrderAuthorService sysUserOrderAuthorService;
 
+    @Autowired
+    private AnalysisDiyCustomerComponent analysisDiyCustomerComponent;
+
     @Autowired
     private ISysPostService postService;
     @Autowired
@@ -139,7 +141,20 @@ public class SysUserController extends BaseController
     }
 
     /**
-     * 新增用户
+     * 获取经销商负责人
+     * @param depCode
+     * @param userNo
+     * @return
+     */
+    @GetMapping("/getManagerList")
+    public AjaxResult getManagerList(String depCode , String userNo)
+    {
+        String rusult = analysisDiyCustomerComponent.getManagerList(depCode,userNo);
+        return new  AjaxResult(00000, rusult);
+    }
+
+    /**
+     * 新增获取经销商负责人
      */
     @GetMapping("/add")
     public String add(ModelMap mmap)

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -26,7 +26,6 @@ import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysConfigService;
 import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.mapper.WxQyUserMapper;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -678,6 +677,8 @@ public class AnalysisDiyCustomerComponent {
     public  String  getManagerList(String depCode , String userNo){
     try {
             String url = customerAccessTokenUtil.getUrl(UrlType.MANAGERLIST, null);
+            Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
+            List<SyncFailDetail> failDetails = new ArrayList<>();
             //获取经销商负责人
             //拼接请求参数
             if (StringUtils.isNotEmpty(depCode)){
@@ -686,38 +687,24 @@ public class AnalysisDiyCustomerComponent {
             if (StringUtils.isNotEmpty(userNo)){
                 url = url+"&userNo="+userNo;
             }
+            log.info("获取经销商负责人请求地址{}",url);
             JSONObject managerListJson = JSONObject.parseObject(HttpUtils.sendSSLGet(url));
-            log.info("获取经销商负责人请求地址{},结果为:{}",url,managerListJson);
+            log.info("获取经销商负责人请求结果为:{}",managerListJson);
             int code = managerListJson.getInteger("code");
             if (code == 0) {
                 JSONArray dataArray = managerListJson.getJSONArray("data");
-                JSONObject data = dataArray.getJSONObject(0);
-                String name = data.getString("name");
-                String status = data.getString("status");
-                String userid = data.getString("userid");
-                String customerCode = data.getString("depCode");
-                String customerName = data.getString("depName");
-                String userNum = data.getString("userNo");
-                String enable = data.getString("enable");
-                Boolean isSync = data.getBoolean("isSync");
-                Boolean isDelete = data.getBoolean("isDelete");
-                String mobile = data.getString("mobile");
-                if(isDelete){
-                    return "该用户状态已删除";
-                }
-                if (StringUtils.isEmpty(userid)) {
-                    return "该用户为空";
+                if(dataArray.size() >0){
+                    String packageId = "diycustomer"+new Date().getTime();
+                    buildSysUser(dataArray, null, null, 1, failDetails, packageId, chainsMap);
                 }
-
-
-                return "";
+                return "拉取成功";
             }else {
-                return "获取数据失败";
+                return "获取数据为空";
             }
         } catch (Exception e) {
-            log.error("获取厨卫经理列表接口错误！");
             customerAccessTokenUtil.reSetToken();
-            throw e;
+            log.error("获取经销商负责人接口错误！",e);
+            return "获取数据失败";
         }
     }