# Conflicts:

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

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

@@ -1,27 +1,23 @@
 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 io.lettuce.core.dynamic.annotation.Param;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.dgtly.common.annotation.Log;
 import com.dgtly.common.constant.UserConstants;
@@ -54,6 +50,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysUserOrderAuthorService sysUserOrderAuthorService;
 
+    @Autowired
+    private AnalysisDiyCustomerComponent analysisDiyCustomerComponent;
+
     @Autowired
     private ISysPostService postService;
     @Autowired
@@ -139,7 +138,20 @@ public class SysUserController extends BaseController
     }
 
     /**
-     * 新增用户
+     * 获取经销商负责人
+     * @param depCode
+     * @param userNo
+     * @return
+     */
+    @GetMapping("/getManagerList")
+    public AjaxResult getManagerList(@RequestParam(value = "depCode") String depCode , @RequestParam(value = "userNo") 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

@@ -28,7 +28,6 @@ import com.dgtly.system.service.ISysConfigService;
 import com.dgtly.system.service.ISysDictDataService;
 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;
@@ -676,6 +675,46 @@ public class AnalysisDiyCustomerComponent {
         return null;
     }
 
+    /**
+     * 获取经销商负责人
+     * @param depCode
+     * @param userNo
+     * @return
+     */
+    public  String  getManagerList(String depCode , String userNo){
+    try {
+        log.info("接收到参数depCode:{},userNO:{}",depCode,userNo);
+            String url = customerAccessTokenUtil.getUrl(UrlType.MANAGERLIST, null);
+            Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
+            List<SyncFailDetail> failDetails = new ArrayList<>();
+            //获取经销商负责人
+            //拼接请求参数
+            if (StringUtils.isNotEmpty(depCode)){
+                url = url+"&depCode="+depCode;
+            }
+            if (StringUtils.isNotEmpty(userNo)){
+                url = url+"&userNo="+userNo;
+            }
+            log.info("获取经销商负责人请求地址{}",url);
+            JSONObject managerListJson = JSONObject.parseObject(HttpUtils.sendSSLGet(url));
+            log.info("获取经销商负责人请求结果为:{}",managerListJson);
+            int code = managerListJson.getInteger("code");
+            if (code == 0) {
+                JSONArray dataArray = managerListJson.getJSONArray("data");
+                if(dataArray.size() >0){
+                    String packageId = "diycustomer"+new Date().getTime();
+                    buildSysUser(dataArray, null, null, 1, failDetails, packageId, chainsMap);
+                }
+                return "拉取成功";
+            }else {
+                return "获取数据为空";
+            }
+        } catch (Exception e) {
+            customerAccessTokenUtil.reSetToken();
+            log.error("获取经销商负责人接口错误！",e);
+            return "获取数据失败";
+        }
+    }
 
     /*
      * @description: 厨卫人员拉取
@@ -788,6 +827,8 @@ public class AnalysisDiyCustomerComponent {
         return null;
     }*/
 
+
+
     /**
      * 构建 插入用户List
      * @param

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/utils/CustomerAccessTokenUtil.java

@@ -26,6 +26,7 @@ public class CustomerAccessTokenUtil {
         MANAGERLIST,
         BUSINESSLIST,*/
         WAREHOUSE,
+        MANAGERLIST,
         AllRole,
         STAFF,
         BZ,
@@ -73,9 +74,9 @@ public class CustomerAccessTokenUtil {
     //获取经销商仓管人员列表(分页)
     private String warehouseListUrl ;
     //厨卫 获取老板列表
-   /* private String bossListUrl ;
+   /* private String bossListUrl ;*/
     //厨卫 获取经理列表
-    private String managerUrl ;*/
+    private String managerUrl ;
     //获取经销商分销业务员人员列表(分页)
     private String resellerUrl ;
     //获取厨卫业务员人员
@@ -109,10 +110,10 @@ public class CustomerAccessTokenUtil {
         WqbmListUrl =domain+"/api/diydt/v1/user/outwall/list?page=%s&access_token=%s";
         //获取经销商仓管人员列表(分页)存在name，code
         warehouseListUrl =domain+"/wechatwork/diydt/v2/user/warehouse/list?page=%s&access_token=%s";
-        /**
-        bossListUrl =domain+"/wechatwork/chuwei/v1/user/boss/list?access_token=%s";
-        managerUrl =domain+"/wechatwork/chuwei/v1/user/manager/list?access_token=%s";
-        */
+
+       // bossListUrl =domain+"/wechatwork/chuwei/v1/user/boss/list?access_token=%s";
+        managerUrl =domain+"/api/diydt/v3/user/manager/list?access_token=%s";
+
         //获取经销商分销业务员人员列表(分页)存在name，code
         resellerUrl =domain+"/api/diydt/v2/user/reseller/list?page=%s&access_token=%s";
       /*  businessUrl =domain+"/wechatwork/chuwei/v1/user/business/list?access_token=%s";*/
@@ -195,12 +196,12 @@ public class CustomerAccessTokenUtil {
             case WAREHOUSE:
                 url = String.format(warehouseListUrl,pageNum,token);
                 break;
-      /*      case BOSSLIST:
-                url = String.format(bossListUrl,token);
-                break;
             case MANAGERLIST:
                 url = String.format(managerUrl,token);
                 break;
+      /*      case BOSSLIST:
+                url = String.format(bossListUrl,token);
+                break;
             case BUSINESSLIST:
                 url = String.format(businessUrl, token);
                 break;*/