新零售经销商7

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

@@ -73,6 +73,7 @@ public class AnalysisDiyCustomerComponent {
     private Long[] roleFXDiyIds;  //3.4接口，同步分销用户
     private Long[] roleStoreIds; //3.6门店经销商
     private Long[] roleBusiness;//7.5厨卫业务人员角色
+    private Long[] roleXls;//13.1新零售经销商角色
     /**
      * 获取并解析DIY经销商用户
      * 因为经销商用户并不涉及用信息更新等方面 所以只插入不更新
@@ -98,6 +99,10 @@ public class AnalysisDiyCustomerComponent {
             Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customerHouse.roleid"));
             HouseRoleIds = new Long[]{roleId};
         }
+        if(roleXls ==null){
+            Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customerXls.roleid"));
+            roleXls = new Long[]{roleId};
+        }
 
         if (roleGuideIds == null) {
             Long roleId = Long.parseLong(configService.selectConfigByKey("libang.guide.roleid"));
@@ -401,6 +406,31 @@ public class AnalysisDiyCustomerComponent {
                 total += bz.size();
             }
         }
+
+
+
+
+        //13.1 新零售经销商人员列表
+        String xlsCustomerJson ="";
+        try{
+            xlsCustomerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.XLS,null));
+        }catch (Exception e){
+            log.error("获取新零售经销商人员接口错误！");
+            customerAccessTokenUtil.reSetToken();
+            throw e;
+        }
+
+        JSONObject xlsJson = JSONObject.parseObject(xlsCustomerJson);
+
+        code = xlsJson.getInteger("code");
+        if(code==0){
+            JSONArray xlsMANAGER = new JSONArray();
+            xlsMANAGER.addAll(xlsJson.getJSONArray("data"));
+            success+=buildSysUser(xlsMANAGER,loginNameSet,diyNameSet,7,failDetails,packageId,chainsMap);
+            total+=mjson.getJSONArray("data").size();
+        }
+
+
         /*try {
             JSONObject bossListJson = JSONObject.parseObject(HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.BOSSLIST, null)));
             code = bossListJson.getInteger("code");
@@ -645,6 +675,8 @@ public class AnalysisDiyCustomerComponent {
                         user.setRoleIds(FinanceRoleIds);
                     }else if(isManager == 3){
                         user.setRoleIds(HouseRoleIds);
+                    }else if(isManager == 7){
+                        user.setRoleIds(roleXls);
                     }else{
                         user.setRoleIds(roleIds);
                     }
@@ -712,6 +744,8 @@ public class AnalysisDiyCustomerComponent {
                             sysUserService.insertUserRole(user.getUserId(), FinanceRoleIds[0]);
                         }else if(isManager == 3){
                             sysUserService.insertUserRole(user.getUserId(), HouseRoleIds[0]);
+                        }else if (isManager ==7){
+                            sysUserService.insertUserRole(user.getUserId(), roleXls[0]);
                         }else {
                             sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
                         }

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

@@ -25,7 +25,8 @@ public class CustomerAccessTokenUtil {
         WAREHOUSE,
         AllRole,
         STAFF,
-        BZ;
+        BZ,
+        XLS;
 
 
     }
@@ -82,6 +83,9 @@ public class CustomerAccessTokenUtil {
     //获取3.7经销商倍增人员
     private String bzUrl;
 
+    //获取13.1新零售经销商人员
+    private String xLSUrl;
+
     @PostConstruct
     public void init() {
         tokenUrl=domain+"/auth/jwt/v1/gettoken?appid=%s&appsecret=%s";
@@ -105,6 +109,8 @@ public class CustomerAccessTokenUtil {
         staffUrl=domain+"/api/diydt/v1/user/staff/list?page=%s&access_token=%s";
 
         bzUrl=domain+"/api/diydt/v1/user/beizeng/list?page=%s&access_token=%s";
+
+        xLSUrl=domain+"/api/es/v1/user/nrdistributor/list?access_token=%s";
     }
 
     public String getAccessToken(){
@@ -186,6 +192,9 @@ public class CustomerAccessTokenUtil {
                 break;
             case BZ:
                 url = String.format(bzUrl,pageNum,token);
+                break;
+            case XLS:
+                url = String.format(xLSUrl, token);
         }
         return url;
     }