Merge branch 'linshi' into prd

# Conflicts:
#	suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

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,30 @@ 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+=xlsMANAGER.size();
+        }
+
+
         /*try {
             JSONObject bossListJson = JSONObject.parseObject(HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.BOSSLIST, null)));
             code = bossListJson.getInteger("code");
@@ -645,6 +674,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 +743,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;
     }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -324,7 +324,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorDiyList !=null && userOrderAuthorDiyList.size()>0){
             List<Long> diyauthList=userOrderAuthorDiyList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
             List<SysUserOrderAuthor> diyrole=sysUserOrderAuthorMapper.selectByParentId(diyauthList);
-            userOrderAuthorDiyList.addAll(diyrole);
+            if(diyrole !=null && diyrole.size()>0){
+                userOrderAuthorDiyList.addAll(diyrole);
+            }
         }
 
         //division
@@ -333,35 +335,45 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorBMDList !=null && userOrderAuthorBMDList.size()>0){
         List<Long> BMdAuthList=userOrderAuthorBMDList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> BMdRole=sysUserOrderAuthorMapper.selectByParentId(BMdAuthList);
-        userOrderAuthorBMDList.addAll(BMdRole);
+            if(BMdRole !=null && BMdRole.size()>0){
+                userOrderAuthorBMDList.addAll(BMdRole);
+            }
         }
         //12北-NVB2023T01
         List<SysUserOrderAuthor> userOrderAuthor12bList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T01");
         if(userOrderAuthor12bList !=null && userOrderAuthor12bList.size()>0){
         List<Long> b12AuthList=userOrderAuthor12bList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> b12Role=sysUserOrderAuthorMapper.selectByParentId(b12AuthList);
-        userOrderAuthor12bList.addAll(b12Role);
+            if(b12Role !=null && b12Role.size()>0){
+                userOrderAuthor12bList.addAll(b12Role);
+            }
         }
         //12南-NVB2023T02
         List<SysUserOrderAuthor> userOrderAuthor12nList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T02");
         if(userOrderAuthor12nList !=null && userOrderAuthor12nList.size()>0){
         List<Long> n12AuthList=userOrderAuthor12nList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> n12Role=sysUserOrderAuthorMapper.selectByParentId(n12AuthList);
-        userOrderAuthor12nList.addAll(n12Role);
+            if(n12Role !=null && n12Role.size()>0){
+                userOrderAuthor12nList.addAll(n12Role);
+            }
         }
         //12中-NVB2023T03
         List<SysUserOrderAuthor> userOrderAuthor12zList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T03");
         if(userOrderAuthor12zList !=null && userOrderAuthor12zList.size()>0){
         List<Long> z12AuthList=userOrderAuthor12zList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> z12Role=sysUserOrderAuthorMapper.selectByParentId(z12AuthList);
-        userOrderAuthor12zList.addAll(z12Role);
+            if(z12Role !=null && z12Role.size()>0){
+                userOrderAuthor12zList.addAll(z12Role);
+            }
         }
         //36城-NVB2023T04
         List<SysUserOrderAuthor> userOrderAuthor36List = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T04");
         if(userOrderAuthor36List !=null && userOrderAuthor36List.size()>0){
         List<Long> c36AuthList=userOrderAuthor36List.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> c36Role=sysUserOrderAuthorMapper.selectByParentId(c36AuthList);
-        userOrderAuthor36List.addAll(c36Role);
+            if(c36Role !=null && c36Role.size()>0){
+                userOrderAuthor36List.addAll(c36Role);
+            }
         }
         //cw
        /* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
@@ -373,7 +385,18 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorYSLList !=null && userOrderAuthorYSLList.size()>0){
         List<Long> yslauthList=userOrderAuthorYSLList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> yslrole=sysUserOrderAuthorMapper.selectByParentId(yslauthList);
-        userOrderAuthorYSLList.addAll(yslrole);
+            if(yslrole !=null && yslrole.size()>0){
+                userOrderAuthorYSLList.addAll(yslrole);
+            }
+        }
+        //xls
+        List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
+        if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
+            List<Long> xlsAuthList=userOrderAuthorXlsList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
+            List<SysUserOrderAuthor> xlsRole=sysUserOrderAuthorMapper.selectByParentId(xlsAuthList);
+            if(xlsRole !=null && xlsRole.size()>0){
+                 userOrderAuthorXlsList.addAll(xlsRole);
+            }
         }
 
         userExtMapper.selectUserExtList().forEach(sysUserExt -> {
@@ -381,11 +404,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             if (sales != null) {
             int index = sales.indexOf("_");
             String intNumber = sales.substring(0, index);
-          /*  if (intNumber.equals("cw")) {
+           /* if (intNumber.equals("cw")) {
                 userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
             } else*/ if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
-                    || intNumber.equals("saledept") || intNumber.equals("suboffice")|| intNumber.equals("customer")) {
+                    || intNumber.equals("saledept") || intNumber.equals("suboffice")) {
                 userOrderAuthorList.clear();
                 roleAuth.clear();
                 userOrderAuthorList.addAll(userOrderAuthorDiyList);
@@ -408,6 +431,30 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         userOrderAuthorList.addAll(userOrderAuthor36List);
                     }
 
+                }else if(intNumber.equals("customer")){
+                    String isCustomerManager=sysUserExt.getIsCustomerManager();
+                    if(isCustomerManager !=null && !("").equals(isCustomerManager)){
+                        List<String> isManager =Arrays.asList(isCustomerManager.split(","));
+                        //7新零售经销商
+                        if(isManager.size()==1 && isManager.contains("7")){
+                            userOrderAuthorList.clear();
+                            roleAuth.clear();
+                            userOrderAuthorList.addAll(userOrderAuthorXlsList);
+                        }else if(isManager.contains("7") && isManager.size()>1 ){
+                            userOrderAuthorList.clear();
+                            roleAuth.clear();
+                            userOrderAuthorList.addAll(userOrderAuthorXlsList);
+                            userOrderAuthorList.addAll(userOrderAuthorDiyList);
+                        }else {
+                            userOrderAuthorList.clear();
+                            roleAuth.clear();
+                            userOrderAuthorList.addAll(userOrderAuthorDiyList);
+                        }
+                    }else{
+                        userOrderAuthorList.clear();
+                        roleAuth.clear();
+                        userOrderAuthorList.addAll(userOrderAuthorDiyList);
+                    }
                 }
             if(userOrderAuthorList !=null && userOrderAuthorList.size()>0){
                 userAuthorRelMapper.deleteSysUserAuthorRelById(sysUserExt.getUserId());

suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -206,7 +206,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             e.sales_level as salesLevel,
             e.org_code as orgCode,
-            e.user_id as userId
+            e.user_id as userId,
+            e.is_customer_manager as isCustomerManager
         FROM
             sys_user_ext e LEFT JOIN sys_user u on  u.user_id = e.user_id
         WHERE

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

@@ -402,13 +402,6 @@ public class EsignController extends ApiBaseController {
             if(businessScence!=null &&!("司机授权").equals(businessScence)){
                 signService.callbackNotice(orderFlag);
 
-            }else{
-                OrderFile orderFile = new OrderFile();
-                orderFile.setFlowId(orderFlag.getFlowId());
-                orderFile.setCode("200");
-                orderFile.setMessage("success");
-                orderFileService.updateOrderFileByFlowId(orderFile);
-
             }
 
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/EsignSignServiceImpl.java

@@ -258,20 +258,23 @@ public class EsignSignServiceImpl implements IEsignSignService {
         /*下载保存签署后的文件，返回文件存储地址*/
         OrderFile orderFile = new OrderFile();
         orderFile.setFlowId(flowId);
-        if(orderFlag.getTypes()==1){
-            downloadFile(Global.getPdfPath(), orderFlag.getOrderId()+uId + ".pdf", fileUrl);
-            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + ".pdf");
-            tmsCertificate(orderFlag.getDeliveryNumber(),Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + ".pdf");
-        }else if( orderFlag.getTypes()==2){
+        if(orderFlag.getTypes().equals(1)){
+            downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + ".pdf", fileUrl);
+            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + ".pdf");
+            log.info("E签宝 = [{}], 流程id = [{}]",orderFile.getFileUrl(),orderFile.getFlowId());
+            orderFileService.updateOrderFileByFlowId(orderFile);
+            tmsCertificate(orderFlag.getDeliveryNumber(),Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + ".pdf");
+        }else if( orderFlag.getTypes().equals(2)){
+            downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + "_签收订单.pdf", fileUrl);
+            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + "_签收订单.pdf");
+            log.info("E签宝 = [{}], 流程id = [{}]",orderFile.getFileUrl(),orderFile.getFlowId());
+            orderFileService.updateOrderFileByFlowId(orderFile);
+        }else{
             downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + "_授权委托.pdf", fileUrl);
             orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + "_授权委托.pdf");
-        }else{
-            downloadFile(Global.getPdfPath(), orderFlag.getOrderId()+uId + "_签收订单.pdf", fileUrl);
-            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + "_签收订单.pdf");
-
+            log.info("E签宝 = [{}], 流程id = [{}]",orderFile.getFileUrl(),orderFile.getFlowId());
+            orderFileService.updateOrderFileByFlowId(orderFile);
         }
-//        orderFile.setFileUrl(refile);
-        orderFileService.updateOrderFileByFlowId(orderFile);
     }
     /**
      * @description: orders交货单