合并1201分支

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

@@ -118,7 +118,6 @@ public class AlertConfigurationController extends BaseController
     {
 
         log.info("新增弹框配置");
-        log.info("222222222{}", JSON.toJSON(alertConfiguration));
         //如果userType为空,则添加所有人通知
         if (StringUtils.isEmpty(alertConfiguration.getUserType())){
             alertConfiguration.setUserType("2");

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,21 @@ public class SysUserController extends BaseController
     }
 
     /**
-     * 新增用户
+     * 获取经销商负责人
+     * @param depCode
+     * @param userNo
+     * @return
+     */
+    @GetMapping("/getManagerList")
+    @ResponseBody
+    public AjaxResult getManagerList(@RequestParam(value = "depCode" , required = false) String depCode , @RequestParam(value = "userNo", required = false) String userNo)
+    {
+        String result =  analysisDiyCustomerComponent.getManagerList(depCode,userNo);
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 新增获取经销商负责人
      */
     @GetMapping("/add")
     public String add(ModelMap mmap)

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

@@ -0,0 +1,26 @@
+package com.dgtly.web.controller.system;
+
+import com.dgtly.common.core.controller.BaseController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 缓存清理
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/system/getCustomerData")
+public class getCustomerDataController extends BaseController
+{
+    private String prefix = "system/getCustomerData";
+
+    @RequiresPermissions("system:getCustomerData:view")
+    @GetMapping()
+    public String clearStorage()
+    {
+        return prefix + "/getCustomerData";
+    }
+}

suishenbang-admin/src/main/resources/templates/monitor/clearStorage/clearStorage.html

@@ -50,7 +50,7 @@
             </div>
         </div>
         <div class="row" style="margin-top: 10px;">
-            <label class="col-sm-1 control-label" style="text-align: right;padding: 0;">清空单体：</label>
+            <label class="col-sm-1 control-label" style="text-align: right;padding: 0;height: 34px;line-height: 34px;">清空单体：</label>
             <div class="col-sm-8">
                 <input type="text" id="keyName" name="" class="form-control" placeholder="">
             </div>

suishenbang-admin/src/main/resources/templates/system/getCustomerData/getCustomerData.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('缓存清理')" />
+</head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content">
+    <div class="col-sm-12">
+        <div class="row" style="margin-top: 10px;">
+            <label class="col-sm-1 control-label" style="text-align: right;padding: 0;height: 34px;line-height: 34px;font-size: 14px;font-weight: bold;">经销商代码：</label>
+            <div class="col-sm-2">
+                <input type="text" id="keyName" name="" class="form-control" placeholder="输入经销商代码">
+            </div>
+        </div>
+        <div class="row" style="margin-top: 10px;">
+            <label class="col-sm-1 control-label"></label>
+            <button id="applyBtn" class="btn btn-success" style="margin-left: 15px;">
+                提交
+            </button>
+        </div>
+    </div>
+</div>
+</body>
+<th:block th:include="include :: footer" />
+<script type="text/javascript">
+    var domain = window.location.host;
+    var ht = domain.indexOf('localhost') != -1 ? 'http://' : 'https://';
+    var prefixEdit = ht + domain + "/oneportal/system/user/getManagerList";
+    // var prefixEdit = 'https://suishenbangtest.nipponpaint.com.cn/oneportal/system/user/getManagerList';
+
+    $('#applyBtn').on('click', function (res) {
+        var keyNameValue = $('#keyName').val();
+        if (keyNameValue == ''){
+            $.modal.alertWarning('请输入经销商代码');
+            return;
+        }
+        var data = {
+            depCode:keyNameValue
+        }
+        console.log(1,data);
+        $.ajax({
+            url: prefixEdit,
+            type: "get",
+            contentType: 'application/json',
+            data: data,
+            success: function (result) {
+                if (result.code == 0) {
+                    $.modal.alertWarning(result.msg);
+                } else {
+                    $.modal.alertWarning(result.msg);
+                }
+            }
+        })
+    })
+</script>
+</html>

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

@@ -69,6 +69,9 @@ public interface CustomersMapper
     @MapKey("chainsCode")
     public Map<String,Customers> selectCustomerMapByChainsCode();
 
+    @MapKey("chainsCode")
+    public Map<String,Customers> selectCustomerMapByChainsCodeByCode(String CustomerCode);
+
     /**
      * @description:根据经销商code查询名称
      * @param:

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

@@ -26,7 +26,6 @@ import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysConfigService;
 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;
@@ -143,13 +142,13 @@ public class AnalysisDiyCustomerComponent {
                     MSQ.addAll(msqjson.getJSONArray("data"));
                 }
             }
-            success += buildSysUser(MSQ, loginNameSet, diyNameSet, 4, failDetails, packageId, chainsMap);
+            success += buildSysUser(false,MSQ, loginNameSet, diyNameSet, 4, failDetails, packageId, chainsMap);
             total += MSQ.size();
         } else {
             int code = msqjson.getInteger("code");
             if (code == 0) {
                 MSQ.addAll(msqjson.getJSONArray("data"));
-                success += buildSysUser(MSQ, loginNameSet, diyNameSet, 4, failDetails, packageId, chainsMap);
+                success += buildSysUser(false,MSQ, loginNameSet, diyNameSet, 4, failDetails, packageId, chainsMap);
                 total += MSQ.size();
             }
         }
@@ -187,14 +186,14 @@ public class AnalysisDiyCustomerComponent {
                     WQBM.addAll(wqbmjson.getJSONArray("data"));
                 }
             }
-            success += buildSysUser(WQBM, loginNameSet, diyNameSet, 5, failDetails, packageId, chainsMap);
+            success += buildSysUser(false,WQBM, loginNameSet, diyNameSet, 5, failDetails, packageId, chainsMap);
             total += WQBM.size();
 
         } else {
             int code = msqjson.getInteger("code");
             if (code == 0) {
                 WQBM.addAll(msqjson.getJSONArray("data"));
-                success += buildSysUser(WQBM, loginNameSet, diyNameSet, 5, failDetails, packageId, chainsMap);
+                success += buildSysUser(false,WQBM, loginNameSet, diyNameSet, 5, failDetails, packageId, chainsMap);
                 total += WQBM.size();
             }
         }
@@ -456,7 +455,7 @@ public class AnalysisDiyCustomerComponent {
         if(code==0){
             JSONArray STOREGUIDE = new JSONArray();
             STOREGUIDE.addAll(gjson.getJSONArray("userlist"));
-            success+=buildSysUser(STOREGUIDE,loginNameSet,diyNameSet,0,failDetails,packageId,codeMap);
+            success+=buildSysUser(false,STOREGUIDE,loginNameSet,diyNameSet,0,failDetails,packageId,codeMap);
             total+=gjson.getJSONArray("userlist").size();
         }
 
@@ -477,7 +476,7 @@ public class AnalysisDiyCustomerComponent {
         if(code==0){
             JSONArray MANAGER = new JSONArray();
             MANAGER.addAll(mjson.getJSONArray("userlist"));
-            success+=buildSysUser(MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
+            success+=buildSysUser(false,MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
             total+=mjson.getJSONArray("userlist").size();
         }
 //财务3.2
@@ -513,13 +512,13 @@ public class AnalysisDiyCustomerComponent {
                     FINANCE.addAll(fjson.getJSONArray("userlist"));
                 }
             }
-            success+=buildSysUser(FINANCE,loginNameSet,diyNameSet,2,failDetails,packageId,chainsMap);
+            success+=buildSysUser(false,FINANCE,loginNameSet,diyNameSet,2,failDetails,packageId,chainsMap);
             total+=FINANCE.size();
         }else{
             code = fjson.getInteger("code");
             if(code==0){
                 FINANCE.addAll(fjson.getJSONArray("userlist"));
-                success+=buildSysUser(FINANCE,loginNameSet,diyNameSet,2,failDetails,packageId,chainsMap);
+                success+=buildSysUser(false,FINANCE,loginNameSet,diyNameSet,2,failDetails,packageId,chainsMap);
                 total+=FINANCE.size();
             }
         }
@@ -557,13 +556,13 @@ public class AnalysisDiyCustomerComponent {
                     WAREHOUSE.addAll(wjson.getJSONArray("userlist"));
                 }
             }
-            success+=buildSysUser(WAREHOUSE,loginNameSet,diyNameSet,3,failDetails,packageId,chainsMap);
+            success+=buildSysUser(false,WAREHOUSE,loginNameSet,diyNameSet,3,failDetails,packageId,chainsMap);
             total+=WAREHOUSE.size();
         }else{
             code = wjson.getInteger("code");
             if(code==0){
                 WAREHOUSE.addAll(wjson.getJSONArray("userlist"));
-                success+=buildSysUser(WAREHOUSE,loginNameSet,diyNameSet,3,failDetails,packageId,chainsMap);
+                success+=buildSysUser(false,WAREHOUSE,loginNameSet,diyNameSet,3,failDetails,packageId,chainsMap);
                 total+=WAREHOUSE.size();
             }
         }
@@ -584,7 +583,7 @@ public class AnalysisDiyCustomerComponent {
         if(code==0){
             JSONArray xlsMANAGER = new JSONArray();
             xlsMANAGER.addAll(xlsJson.getJSONArray("data"));
-            success+=buildSysUser(xlsMANAGER,loginNameSet,diyNameSet,7,failDetails,packageId,chainsMap);
+            success+=buildSysUser(false,xlsMANAGER,loginNameSet,diyNameSet,7,failDetails,packageId,chainsMap);
             total+=xlsMANAGER.size();
         }
 
@@ -603,7 +602,7 @@ public class AnalysisDiyCustomerComponent {
         if(code==0){
             JSONArray homeCustomer = new JSONArray();
             homeCustomer.addAll(homeJson.getJSONArray("userlist"));
-            success+=buildSysUser(homeCustomer,loginNameSet,diyNameSet,9,failDetails,packageId,chainsMap);
+            success+=buildSysUser(false,homeCustomer,loginNameSet,diyNameSet,9,failDetails,packageId,chainsMap);
             total+=homeCustomer.size();
         }
 
@@ -669,6 +668,55 @@ 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.selectCustomerMapByChainsCodeByCode(depCode);
+            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){
+                    StringBuffer users = new StringBuffer();
+                    for (int i = 0; i < dataArray.size(); i++){
+                        JSONObject object = dataArray.getJSONObject(i);
+                        String name = object.getString("name");
+                        users.append(name).append(",");
+                    }
+                    String packageId = "diycustomer"+new Date().getTime();
+                    buildSysUser(true ,dataArray, null, null, 1, failDetails, packageId, chainsMap);
+                    return users.substring(0,users.length()-1)+"同步成功";
+                }else {
+                    return "同步成功,数据为空";
+                }
+            }else {
+                return "获取数据失败";
+            }
+        } catch (Exception e) {
+            customerAccessTokenUtil.reSetToken();
+            log.error("获取经销商负责人接口错误！",e);
+            return "获取数据失败";
+        }
+    }
+
 
     /*
      * @description: 厨卫人员拉取
@@ -788,11 +836,13 @@ public class AnalysisDiyCustomerComponent {
      * @param isManager
      * @return
      */
-    public Integer buildSysUser(JSONArray jsonArray, Set<String> loginNameSet,Set<String> diyNameSet, int isManager, List<SyncFailDetail> failDetails,String packageId, Map<String,Customers> cusMap) {
+    public Integer buildSysUser(boolean oneUser,JSONArray jsonArray, Set<String> loginNameSet,Set<String> diyNameSet, int isManager, List<SyncFailDetail> failDetails,String packageId, Map<String,Customers> cusMap) {
         // JSONArray jsonArray = json.getJSONArray("userlist");
-        log.info("开始解析用户列表");
-        log.info("用户列表数量：{}", jsonArray.size());
         log.info("开始解析用户列表{}",jsonArray);
+        if (oneUser){
+            Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customer.roleid"));
+            roleIds = new Long[]{roleId};
+        }
         int count = 0;
         List<String> interfaceList = new ArrayList<>();
         List<UserAssVO> assVOList =new ArrayList<>();
@@ -819,91 +869,95 @@ public class AnalysisDiyCustomerComponent {
         List<String> collect =new ArrayList<>();
         loginNames.removeAll(interfaceList);
         collect.addAll(loginNames);
-        if (collect.size() > 0) {
-            for (String login : collect
-            ) {
-                SysUser u = sysUserService.selectUserByLoginName(login);
-                if (("0").equals(u.getIsSync())) {
-                    String CustomerManager = u.getSysUserExt().getIsCustomerManager();
-                    String[] manager = CustomerManager.split(",");
-                    if (manager.length > 1) {
-                        if(assVOList !=null && assVOList.size()>0){
-                            boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
-                            if(containsValue){
-                                for (UserAssVO vo:assVOList
-                                     ) {
-                                    if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber()) ){
-                                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
-                                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
+        if (!oneUser){
+            if (collect.size() > 0) {
+                for (String login : collect
+                ) {
+                    SysUser u = sysUserService.selectUserByLoginName(login);
+                    if (("0").equals(u.getIsSync())) {
+                        String CustomerManager = u.getSysUserExt().getIsCustomerManager();
+                        if (StringUtils.isNotEmpty(CustomerManager)){
+                            String[] manager = CustomerManager.split(",");
+                            if (manager.length > 1) {
+                                if(assVOList !=null && assVOList.size()>0){
+                                    boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
+                                    if(containsValue){
+                                        for (UserAssVO vo:assVOList
+                                        ) {
+                                            if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber()) ){
+                                                List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
+                                                if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                                                    assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
+                                                }
+                                            }
                                         }
                                     }
-                                }
-                            }
-
-                        }
-                        List<String> resultList = new ArrayList<>(manager.length);
-                        Collections.addAll(resultList,manager);
-                        Object i=isManager;
-                        resultList.remove(i.toString());
-                        String IsManager = resultList.stream().map(String::valueOf).collect(Collectors.joining(","));
-                        u.getSysUserExt().setIsCustomerManager(IsManager);
-                        sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                    } else {
-                        if(assVOList !=null && assVOList.size()>0){
-                            boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
-                            if(containsValue){
-                                for (UserAssVO vo:assVOList
-                                ) {
-                                    if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber())){
-                                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
-                                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
-                                        }else{
-                                                //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
-                                                if(("1").equals(u.getIsShopAccount())){
-                                                    SysUserExt userExt = u.getSysUserExt();
-                                                    if(userExt !=null){
-                                                        userExt.setDelFlag("2");
-                                                        userExt.setDelTime(new Date());
-                                                        sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                                                    }
 
+                                }
+                                List<String> resultList = new ArrayList<>(manager.length);
+                                Collections.addAll(resultList,manager);
+                                Object i=isManager;
+                                resultList.remove(i.toString());
+                                String IsManager = resultList.stream().map(String::valueOf).collect(Collectors.joining(","));
+                                u.getSysUserExt().setIsCustomerManager(IsManager);
+                                sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                            } else {
+                                if(assVOList !=null && assVOList.size()>0){
+                                    boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
+                                    if(containsValue){
+                                        for (UserAssVO vo:assVOList
+                                        ) {
+                                            if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber())){
+                                                List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
+                                                if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                                                    assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
                                                 }else{
-                                                    u.setQuit("2");
-                                                    sysUserService.updateUserInfo(u);
+                                                    //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
+                                                    if(("1").equals(u.getIsShopAccount())){
+                                                        SysUserExt userExt = u.getSysUserExt();
+                                                        if(userExt !=null){
+                                                            userExt.setDelFlag("2");
+                                                            userExt.setDelTime(new Date());
+                                                            sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                                                        }
+
+                                                    }else{
+                                                        u.setQuit("2");
+                                                        sysUserService.updateUserInfo(u);
+                                                    }
                                                 }
+                                            }
                                         }
-                                    }
-                                }
-                            }else{
-                                //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
-                                if(("1").equals(u.getIsShopAccount())){
-                                    SysUserExt userExt = u.getSysUserExt();
-                                    if(userExt !=null){
-                                        userExt.setDelFlag("2");
-                                        userExt.setDelTime(new Date());
-                                        sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                                    }
+                                    }else{
+                                        //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
+                                        if(("1").equals(u.getIsShopAccount())){
+                                            SysUserExt userExt = u.getSysUserExt();
+                                            if(userExt !=null){
+                                                userExt.setDelFlag("2");
+                                                userExt.setDelTime(new Date());
+                                                sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                                            }
 
+                                        }else{
+                                            u.setQuit("2");
+                                            sysUserService.updateUserInfo(u);
+                                        }
+                                    }
                                 }else{
-                                    u.setQuit("2");
-                                    sysUserService.updateUserInfo(u);
-                                }
-                            }
-                        }else{
-                            //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
-                            if(("1").equals(u.getIsShopAccount())){
-                                SysUserExt userExt = u.getSysUserExt();
-                                if(userExt !=null){
-                                    userExt.setDelFlag("2");
-                                    userExt.setDelTime(new Date());
-                                    sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                                }
+                                    //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
+                                    if(("1").equals(u.getIsShopAccount())){
+                                        SysUserExt userExt = u.getSysUserExt();
+                                        if(userExt !=null){
+                                            userExt.setDelFlag("2");
+                                            userExt.setDelTime(new Date());
+                                            sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                                        }
 
-                            }else{
-                                u.setQuit("2");
-                                sysUserService.updateUserInfo(u);
+                                    }else{
+                                        u.setQuit("2");
+                                        sysUserService.updateUserInfo(u);
+                                    }
+                                }
                             }
                         }
                     }
@@ -1019,7 +1073,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();
                         userExt.setUserId(user.getUserId());
@@ -1048,7 +1102,6 @@ public class AnalysisDiyCustomerComponent {
                         user.setSysUserExt(userExt);
                         userOld.setSysUserExt(userExt);
                     }
-
                     if (("0").equals(user.getIsSync())) {
                         //查询该用户是否存在该接口返回中
                         user.setPhonenumber(jo.getString("mobile"));

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

@@ -115,7 +115,7 @@ public class ShopUserTypeComponent {
                 calendar.set(Calendar.MILLISECOND, 0);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 String runTime = sdf.format(calendar.getTime());
-                if (runTime.contains("2025-11-29")){
+                if (runTime.contains("2025-11-24")){
                     runTime = "2025-08-28T00:00";
                 }
                 stoneParams.put("datetime_start", runTime);
@@ -204,7 +204,7 @@ public class ShopUserTypeComponent {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 Date date = sdf.parse(truncatedDate);
                 String runTime = sdf.format(date);
-                if (runTime.contains("2025-11-29")){
+                if (runTime.contains("2025-11-24")){
                     runTime = "2025-08-28T00:00";
                 }
                 //获取上次同步时间进行增量同步

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;*/

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

@@ -137,6 +137,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT CustomerCode as chains_code,CustomerName as chains_name FROM data_master_customer where CustomerCode is not null
     </select>
 
+    <select id="selectCustomerMapByChainsCodeByCode" resultMap="CustomersResult">
+        SELECT CustomerCode as chains_code,CustomerName as chains_name FROM data_master_customer where CustomerCode = #{CustomerCode}
+    </select>
+
     <select id="selectCustomerNameByCustomerCode" resultType="java.lang.String">
         select CustomerName from data_master_customer where 1=1
         <if test="customerCode !=null and customerCode !='' ">and CustomerCode =#{customerCode}</if>