导购编码

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

@@ -131,6 +131,28 @@ public class AnalysisDiyCustomerComponent {
         long success = 0;
         Set<String> loginNameSet = sysUserService.selectAllUserLoginName();
         Set<String> diyNameSet = sysUserService.selectDiyUserLoginName();
+
+
+        //导购经销商
+        String guideJson ="";
+        try{
+            guideJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.STOREGUIDE,null));
+        }catch (Exception e){
+            log.error("获取经销商导购接口错误！");
+            customerAccessTokenUtil.reSetToken();
+            throw e;
+        }
+        Map<String,Customers> codeMap = customersMapper.selectCustomerMapByCode();
+        JSONObject gjson = JSONObject.parseObject(guideJson);
+        int code = gjson.getInteger("code");
+        if(code==0){
+            JSONArray STOREGUIDE = new JSONArray();
+            STOREGUIDE.addAll(gjson.getJSONArray("userlist"));
+            success+=buildSysUser(STOREGUIDE,loginNameSet,diyNameSet,0,failDetails,packageId,codeMap);
+            total+=gjson.getJSONArray("userlist").size();
+        }
+
+        //经销商负责人
         String managerJson ="";
         try{
             managerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.MANAGER,null));
@@ -141,10 +163,10 @@ public class AnalysisDiyCustomerComponent {
         }
 
         JSONObject mjson = JSONObject.parseObject(managerJson);
-        Map<String,Customers> codeMap = customersMapper.selectCustomerMapByCode();
+
 
         Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
-        int code = mjson.getInteger("code");
+         code = mjson.getInteger("code");
         if(code==0){
             JSONArray MANAGER = new JSONArray();
             MANAGER.addAll(mjson.getJSONArray("userlist"));
@@ -154,23 +176,6 @@ public class AnalysisDiyCustomerComponent {
 
 
 
-        String guideJson ="";
-        try{
-            guideJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.STOREGUIDE,null));
-        }catch (Exception e){
-            log.error("获取经销商导购接口错误！");
-            customerAccessTokenUtil.reSetToken();
-            throw e;
-        }
-
-        JSONObject gjson = JSONObject.parseObject(guideJson);
-        code = gjson.getInteger("code");
-        if(code==0){
-            JSONArray STOREGUIDE = new JSONArray();
-            STOREGUIDE.addAll(gjson.getJSONArray("userlist"));
-            success+=buildSysUser(STOREGUIDE,loginNameSet,diyNameSet,0,failDetails,packageId,codeMap);
-            total+=gjson.getJSONArray("userlist").size();
-        }
 
 
         // 3.4、获取经销商分销业务员人员列表(分页)开始： ===================>
@@ -734,6 +739,20 @@ public class AnalysisDiyCustomerComponent {
                             user.getSysUserExt().setCustomerCode(user.getSysUserExt().getOrgCode());
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
+                        if(user.getSysUserExt().getIsCustomerManager() !=null){
+                            if(user.getSysUserExt().getIsCustomerManager().contains("0")){
+                                if(("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3))){
+                                    if (cusMap.containsKey(customerCode)) {
+                                        Customers c = cusMap.get(customerCode);
+                                        user.getSysUserExt().setOrgCode(c.getChainsCode());
+                                        user.getSysUserExt().setOrgName(c.getChainsName());
+                                    } else {
+                                        user.getSysUserExt().setOrgCode(customerCode);
+                                        user.getSysUserExt().setOrgName(customerName);
+                                    }
+                                }
+                            }
+                        }
                         /*解决名称不一样的情况*/
                         if (!user.getUserName().equals(name)) {
                             user.setUserName(name);