拉取经销商负责人逻辑调整

suishenbang-api/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: uat
 
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

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

@@ -1019,7 +1019,7 @@ public class AnalysisDiyCustomerComponent {
                     SysUser userOld = sysUserService.selectUserByLoginName(userid);
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     //将用户扩展表的信息给加上
-                 /*   if(StringUtils.isBlank(user.getSysUserExt().getSalesLevel())){
+                    if(StringUtils.isBlank(user.getSysUserExt().getSalesLevel())){
                         log.info("进行用户扩展表信息补偿：--------userId:"+user.getSysUserExt().getUserId().toString());
 
                         SysUserExt userExt = new SysUserExt();
@@ -1046,8 +1046,10 @@ public class AnalysisDiyCustomerComponent {
                             userExt.setCustomerCode(jo.getString("depCode"));
                         }
                         sysUserExtMapper.insertOrUpSysUserExt(userExt);
+                        userOld.setSysUserExt(userExt);
+                        user.setSysUserExt(userExt);
                     }
-*/
+
                     if (("0").equals(user.getIsSync())) {
                         //查询该用户是否存在该接口返回中
                         user.setPhonenumber(jo.getString("mobile"));

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

@@ -16,6 +16,7 @@ public class CustomerAccessTokenUtil {
     public enum UrlType{
 
         MANAGER,
+        MANAGERPARAM,
         STOREGUIDE,
         FINANCE,
 
@@ -64,6 +65,8 @@ public class CustomerAccessTokenUtil {
     private String tokenUrl;
     //获取经销商负责人列表
     private String managerListUrl ;
+    //经销商负责人列表带参数
+    private String managerparamListUrl;
     //获取经销商导购列表
     private String storeGuideListUrl ;
     //获取经销商财务人员列表(分页)
@@ -99,6 +102,8 @@ public class CustomerAccessTokenUtil {
         tokenUrl=domain+"/auth/jwt/v1/gettoken?appid=%s&appsecret=%s";
         //获取经销商负责人列表存在name，code
         managerListUrl =domain+"/wechatwork/diydt/v1/user/manager/list?access_token=%s";
+        //获取经销商负责人列表存在带参数
+        managerparamListUrl =domain+"/api/diydt/v3/user/manager/list?access_token=%s&userNo=%s&depCode=%s";
         //获取经销商门店导购人员列表
         storeGuideListUrl =domain+"/wechatwork/diydt/v1/user/storeGuide/list?access_token=%s";
         //获取经销商财务人员列表(分页)存在name，code
@@ -168,7 +173,16 @@ public class CustomerAccessTokenUtil {
         return accessToken;
 
     }
-
+    public String getUrlByParam(UrlType type,String userNo,String depCode){
+        String token = getAccessToken();
+        String url ="";
+        switch (type) {
+            case MANAGERPARAM:
+                url = String.format(managerparamListUrl,token,userNo,depCode);
+                break;
+        }
+        return url;
+    }
 
     public String getUrl(UrlType type,String pageNum){
         String token = getAccessToken();
@@ -177,6 +191,9 @@ public class CustomerAccessTokenUtil {
             case MANAGER:
                 url = String.format(managerListUrl,token);
                 break;
+            case MANAGERPARAM:
+                url = String.format(managerparamListUrl,token);
+                break;
             case STOREGUIDE:
                 url = String.format(storeGuideListUrl,token);
                 break;

suishenbang-wxportal/suishenbang-wxportal-api/pom.xml

@@ -26,5 +26,11 @@
             <artifactId>suishenbang-wxportal-common</artifactId>
             <version>4.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-sync-common</artifactId>
+            <version>4.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.annotation.ApiPassToken;
 import com.dgtly.common.annotation.Log;
 import com.dgtly.common.core.controller.ApiBaseController;
@@ -12,8 +14,16 @@ import com.dgtly.common.core.domain.ParameterObject;
 import com.dgtly.common.core.domain.Ztree;
 import com.dgtly.common.enums.BusinessType;
 import com.dgtly.common.utils.StringUtils;
+import com.dgtly.common.utils.http.HttpUtils;
+import com.dgtly.sync.domain.Customers;
+import com.dgtly.sync.domain.SyncFailDetail;
+import com.dgtly.sync.domain.SyncLog;
+import com.dgtly.sync.mapper.CustomersMapper;
+import com.dgtly.sync.service.AnalysisDiyCustomerComponent;
+import com.dgtly.sync.utils.CustomerAccessTokenUtil;
 import com.dgtly.system.domain.*;
 import com.dgtly.system.service.*;
+import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.domain.HelpCenter;
 import com.dgtly.wxportal.domain.WxBanner;
 import com.dgtly.wxportal.domain.WxMagnet;
@@ -449,9 +459,62 @@ public class WxPortalController extends ApiBaseController {
     }
 
 
+
+
+
     @PostMapping("/getHomeIconInfo")
     public AjaxResult getHoemIconCongif() throws IOException {
         Map<String,Object> iconInfo= wxMagnetService.selectHomeIconInfoById();
         return  AjaxResult.success(iconInfo);
     }
+
+    //拉取经销商负责人 按照经销商编码
+    @Autowired
+    private CustomerAccessTokenUtil customerAccessTokenUtil;
+    @Autowired
+    private AnalysisDiyCustomerComponent analysisDiyCustomerComponent;
+    @Autowired
+    private SysUserServiceImpl sysUserService;
+    @Autowired
+    private CustomersMapper customersMapper;
+    @PostMapping("/getCustomerManage")
+    public AjaxResult getCustomerManage(@RequestBody Map m) throws IOException {
+        String userNo=m.get("userNo").toString();
+        String depCode=m.get("depCode").toString();
+        Map<String, Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
+        List<SyncFailDetail> failDetails = new ArrayList<>();
+        SyncLog syncLog = new SyncLog();
+        syncLog.setStartTime(new Date());
+        String packageId = "diycustomer"+syncLog.getStartTime().getTime();
+        syncLog.setPackageId(packageId);
+        long total = 0;
+        long success = 0;
+        Set<String> loginNameSet = sysUserService.selectAllUserLoginName();
+        Set<String> diyNameSet = sysUserService.selectDiyUserLoginName();
+        String managerJson ="";
+        try{
+            managerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrlByParam(CustomerAccessTokenUtil.UrlType.MANAGERPARAM,userNo,depCode));
+        }catch (Exception e){
+            log.error("获取经销商经理接口错误！");
+            customerAccessTokenUtil.reSetToken();
+            throw e;
+        }
+        JSONObject mjson = JSONObject.parseObject(managerJson);
+        int code = mjson.getInteger("code");
+        if(code==0){
+            JSONArray MANAGER = new JSONArray();
+            MANAGER.addAll(mjson.getJSONArray("userlist"));
+            success+=analysisDiyCustomerComponent.buildSysUser(MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
+            total+=mjson.getJSONArray("userlist").size();
+        }
+
+
+
+
+
+        Map<String,Object> iconInfo= wxMagnetService.selectHomeIconInfoById();
+        return  AjaxResult.success(iconInfo);
+    }
+
+
 }