修改页面和修改解析经销商

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/mapper/CustomersMapper.java

@@ -63,5 +63,9 @@ public interface CustomersMapper
     public int deleteCustomersByIds(String[] ids);
 
     @MapKey("code")
-    public Map<String,Customers> selectCustomerMap();
+    public Map<String,Customers> selectCustomerMapByCode();
+
+    @MapKey("chainsCode")
+    public Map<String,Customers> selectCustomerMapByChainsCode();
+
 }

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

@@ -83,10 +83,12 @@ public class AnalysisDiyCustomerComponent {
         Set<String> loginNameSet = sysUserService.selectAllUserLoginName();
         String managerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.MANAGER));
         JSONObject mjson = JSONObject.parseObject(managerJson);
-        Map<String,Customers> cusMap = customersMapper.selectCustomerMap();
+        Map<String,Customers> codeMap = customersMapper.selectCustomerMapByCode();
+
+        Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
         int code = mjson.getInteger("code");
         if(code==0){
-            success+=buildSysUser(mjson,loginNameSet,1,failDetails,packageId,cusMap);
+            success+=buildSysUser(mjson,loginNameSet,1,failDetails,packageId,chainsMap);
             total+=mjson.getJSONArray("userlist").size();
         }
 
@@ -97,7 +99,7 @@ public class AnalysisDiyCustomerComponent {
         JSONObject gjson = JSONObject.parseObject(guideJson);
         code = gjson.getInteger("code");
         if(code==0){
-            success+=buildSysUser(gjson,loginNameSet,0,failDetails,packageId,cusMap);
+            success+=buildSysUser(gjson,loginNameSet,0,failDetails,packageId,codeMap);
             total+=gjson.getJSONArray("userlist").size();
         }
 
@@ -174,15 +176,16 @@ public class AnalysisDiyCustomerComponent {
                         Customers c = cusMap.get(orgCode);
                         userExt.setOrgCode(c.getChainsCode());
                         userExt.setOrgName(c.getChainsName());
-
+                    }else{
+                        userExt.setOrgCode(orgCode);
                     }
 
-                    /**======== 构建diy用户wx信息表 start===============*/
-                    WxQyUser wxQyUser = new WxQyUser();
-                    wxQyUser.setUserid(jo.getString("userid"));
-                    wxQyUser.setMobile(jo.getString("mobile"));
+//                    /**======== 构建diy用户wx信息表 start===============*/
+//                    WxQyUser wxQyUser = new WxQyUser();
+//                    wxQyUser.setUserid(jo.getString("userid"));
+//                    wxQyUser.setMobile(jo.getString("mobile"));
                     user.setSysUserExt(userExt);
-                    insertUserAndExtAndWx(user, wxQyUser);
+                    insertUserAndExt(user);
                     count++;
                     loginNameSet.add(userNo);
                 }
@@ -202,7 +205,7 @@ public class AnalysisDiyCustomerComponent {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public Integer insertUserAndExtAndWx(SysUser user, WxQyUser wxQyUser) {
+    public Integer insertUserAndExt(SysUser user) {
         // 新增用户信息
         int rows = sysUserMapper.insertUser(user);
 
@@ -214,11 +217,11 @@ public class AnalysisDiyCustomerComponent {
         int i1 = sysUserExtMapper.insertOrUpSysUserExt(userExt);
 
 
-        wxQyUser.setSysUserId(user.getUserId());
-        int i2 =wxQyUserMapper.insertWxQyUser(wxQyUser);
-        if(i1+i2<2){
-            throw new RuntimeException("插入UserExt或WxUser错误");
-        }
+        //wxQyUser.setSysUserId(user.getUserId());
+//        int i2 =wxQyUserMapper.insertWxQyUser(wxQyUser);
+//        if(i1+i2<2){
+//            throw new RuntimeException("插入UserExt或WxUser错误");
+//        }
         return rows;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/CustomersMapper.xml

@@ -130,8 +130,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectCustomerMap" resultMap="CustomersResult">
-       select code ,chains_name,chains_code from customers
+    <select id="selectCustomerMapByCode" resultMap="CustomersResult">
+       select code ,chains_name,chains_code from customers where code is not null
+    </select>
+    <select id="selectCustomerMapByChainsCode" resultMap="CustomersResult">
+       select chains_code ,chains_name  from customers where chains_code is not null
     </select>
     
 </mapper>