qxm-1DIY，2厨卫、3雅士利人员身份修改identity

suishenbang-common/src/main/java/com/dgtly/common/utils/UserIdentityUtil.java

@@ -0,0 +1,28 @@
+package com.dgtly.common.utils;
+
+/**
+ * @description:用户身份权限
+ * @author:qxm
+ * @date:2022/4/26 17:59
+ */
+public class UserIdentityUtil {
+
+    /*装饰涂料事业部*/
+    public final static String UI_DIY = "1";
+    public final static String UI_DIY_NAME = "装饰涂料事业部";
+    /*厨卫底材事业部*/
+    public final static String UI_CW = "2";
+    public final static String UI_CW_NAME = "厨卫底材事业部";
+    /*雅士利*/
+    public final static String UI_YSL = "3";
+    public final static String UI_YSL_NAME = "雅士利";
+    /*辅材事业部*/
+    public final static String UI_FC = "4";
+    public final static String UI_FC_NAME = "辅材事业部";
+    /*新零售中心*/
+    public final static String UI_XLS = "5";
+    public final static String UI_XLS_NAME = "新零售中心";
+    /*SAF事业部*/
+    public final static String UI_SAF = "6";
+    public final static String UI_SAF_NAME = "SAF事业部";
+}

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.ShiroSaltUtil;
+import com.dgtly.common.utils.UserIdentityUtil;
 import com.dgtly.common.utils.http.HttpUtils;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
 import com.dgtly.sync.domain.Customers;
@@ -647,7 +648,7 @@ public class AnalysisDiyCustomerComponent {
                     SysUserExt userExt = new SysUserExt();
                     userExt.setSalesLevel("customer_level");
 
-                    userExt.setIdentity("2");// 1=diy,2=ebr,3=all
+                    userExt.setIdentity(UserIdentityUtil.UI_CW);// 1=diy,2=ebr,3=all
 
                     userExt.setCustomerCode(jo.getString("depCode"));
                     userExt.setIsCustomerManager(isManager + "");
@@ -708,14 +709,16 @@ public class AnalysisDiyCustomerComponent {
                         sysUserService.updateUserInfo(user);
                     }
                     //更新 identity 1=diy,2=ebr,3=all
-                    if (diyNameSet.contains(userid) && !"3".equals(user.getSysUserExt().getIdentity())) {
-                        log.info("updateSysUserExt identity 3" + userid);
-                        user.getSysUserExt().setIdentity("3");
+                    if (diyNameSet.contains(userid) && !"1,2".equals(user.getSysUserExt().getIdentity())) {
+
+                        log.info("updateSysUserExt identity 1,2" + userid);
+                        user.getSysUserExt().setIdentity(UserIdentityUtil.UI_DIY+","+UserIdentityUtil.UI_CW);
+
                         sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                     }
                     if (!diyNameSet.contains(userid) && !"2".equals(user.getSysUserExt().getIdentity())) {
                         log.info("updateSysUserExt identity 2" + userid);
-                        user.getSysUserExt().setIdentity("2");
+                        user.getSysUserExt().setIdentity(UserIdentityUtil.UI_CW);
                         sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                     }
                 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.ShiroSaltUtil;
 import com.dgtly.common.utils.StringUtils;
+import com.dgtly.common.utils.UserIdentityUtil;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 import com.dgtly.sync.domain.SyncFailDetail;
@@ -607,7 +608,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     } else {
                         /**  插入 */
 
-                        userExt.setIdentity("2");
+                        userExt.setIdentity(UserIdentityUtil.UI_CW);
 
                         //修改密码并加密
                         user.setPassword(m.getLoginName());
@@ -784,7 +785,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     } else {
                         /**  插入 */
 
-                        userExt.setIdentity("4");
+                        userExt.setIdentity(UserIdentityUtil.UI_YSL);
 
                         //修改密码并加密
                         user.setPassword(m.getLoginName());

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

@@ -7,6 +7,7 @@ import java.util.stream.Stream;
 import com.dgtly.common.core.domain.Ztree;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.StringUtils;
+import com.dgtly.common.utils.UserIdentityUtil;
 import com.dgtly.system.domain.*;
 import com.dgtly.system.mapper.SysUserAuthorRelMapper;
 import com.dgtly.system.mapper.SysUserExtMapper;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import com.dgtly.system.mapper.SysUserOrderAuthorMapper;
 import com.dgtly.system.service.ISysUserOrderAuthorService;
 import com.dgtly.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 import static java.util.stream.Collectors.toList;
 
@@ -111,8 +113,35 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
     }
 
     @Override
+    @Transactional
     public int insertRel(SysUserAuthorRel role)
     {
+        /*1、查询所有一级节点*/
+        String identity = "";
+        SysUserExt sysUserExt = new SysUserExt();
+        sysUserExt.setUserId(role.getUserId());
+        for (Long authorId : role.getAuthorIds()){
+            SysUserOrderAuthor sysUserOrderAuthor = sysUserOrderAuthorMapper.selectSysUserOrderAuthorById(authorId);
+            if (sysUserOrderAuthor.getParentId()==1L){
+                if(UserIdentityUtil.UI_DIY_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_DIY+",";
+                }else if(UserIdentityUtil.UI_CW_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_CW+",";
+                }else if(UserIdentityUtil.UI_YSL_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_YSL+",";
+                }else if(UserIdentityUtil.UI_FC_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_FC+",";
+                }else if(UserIdentityUtil.UI_XLS_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_XLS+",";
+                }else if(UserIdentityUtil.UI_SAF_NAME.equals(sysUserOrderAuthor.getAuthorName())){
+                    identity+=UserIdentityUtil.UI_SAF+",";
+                }
+            }
+        }
+        if (!"".equals(identity)) {
+            sysUserExt.setIdentity(identity.substring(0, identity.length() - 1));
+        }
+        /*判断节点对应身份进行人员身份修改*/
         userAuthorRelMapper.deleteSysUserAuthorRelById(role.getUserId());
         int rows = 1;
         // 新增角色与部门（数据权限）管理
@@ -127,6 +156,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if (list.size() > 0)
         {
             rows = userAuthorRelMapper.batchRel(list);
+            if (!"".equals(identity)) {
+                rows = userExtMapper.updateSysUserExt(sysUserExt);
+            }
         }
         return rows;
     }

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

@@ -71,10 +71,15 @@ public class EsignController extends ApiBaseController {
     @Autowired
     private IAssRelcustomerinfoService assRelcustomerinfoService;
     /**
-     * 经销商订单签收方法
+     * @description: 经销商订单签收方法
      * 没有注册就注册，注册完就认证，然后再点击签署按钮，获取经销商用户id，对应主体id
      * E签宝一步发起签署
+     * @param: []
+     * @return: java.lang.Object
+     * @author: qxm
+     * @date: 2022/4/27 10:59
      */
+
     @ApiOperation(value = "订单签收", notes = "参数：{'orderId':'xxx','userId':'xxx','deliveryNumber':'xxx','shipmentNumber':'xxx','belongTo':'xxx','redirectUrl':'xxx','wareHouseCode':'xxx','wareHouseName':'xxx'}" +
             "\n（orderId：订单编号" +
             "\n（tmsShipNumber：运单号" +