Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/component/BuildDescUtils.java

@@ -1,6 +1,5 @@
 package com.jzg.organization.component;
 
-import com.jzg.commons.constants.quote.enums.quote.VehicleUseCode;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
@@ -12,32 +11,6 @@ import java.util.stream.Collectors;
 
 public class BuildDescUtils {
 
-    private static final Map<String, String> PLATE_FOUR_CODE_MAP = new HashMap<>();
-
-    static {
-        PLATE_FOUR_CODE_MAP.put("1404", "晋D");  PLATE_FOUR_CODE_MAP.put("1408", "晋M");
-        PLATE_FOUR_CODE_MAP.put("1411", "晋J");  PLATE_FOUR_CODE_MAP.put("1403", "晋C");
-        PLATE_FOUR_CODE_MAP.put("1407", "晋K");  PLATE_FOUR_CODE_MAP.put("1410", "晋L");
-        PLATE_FOUR_CODE_MAP.put("1402", "晋B");  PLATE_FOUR_CODE_MAP.put("1406", "晋F");
-        PLATE_FOUR_CODE_MAP.put("1401", "晋A");  PLATE_FOUR_CODE_MAP.put("1405", "晋E");
-        PLATE_FOUR_CODE_MAP.put("1409", "晋H");  PLATE_FOUR_CODE_MAP.put("14",   "晋");
-        PLATE_FOUR_CODE_MAP.put("31",   "沪");   PLATE_FOUR_CODE_MAP.put("53",   "云");
-        PLATE_FOUR_CODE_MAP.put("15",   "蒙");   PLATE_FOUR_CODE_MAP.put("11",   "京");
-        PLATE_FOUR_CODE_MAP.put("22",   "吉");   PLATE_FOUR_CODE_MAP.put("51",   "川");
-        PLATE_FOUR_CODE_MAP.put("12",   "津");   PLATE_FOUR_CODE_MAP.put("64",   "宁");
-        PLATE_FOUR_CODE_MAP.put("34",   "皖");   PLATE_FOUR_CODE_MAP.put("37",   "鲁");
-        PLATE_FOUR_CODE_MAP.put("44",   "粤");   PLATE_FOUR_CODE_MAP.put("45",   "桂");
-        PLATE_FOUR_CODE_MAP.put("65",   "新");   PLATE_FOUR_CODE_MAP.put("32",   "苏");
-        PLATE_FOUR_CODE_MAP.put("36",   "赣");   PLATE_FOUR_CODE_MAP.put("13",   "冀");
-        PLATE_FOUR_CODE_MAP.put("41",   "豫");   PLATE_FOUR_CODE_MAP.put("33",   "浙");
-        PLATE_FOUR_CODE_MAP.put("46",   "琼");   PLATE_FOUR_CODE_MAP.put("42",   "鄂");
-        PLATE_FOUR_CODE_MAP.put("43",   "湘");   PLATE_FOUR_CODE_MAP.put("62",   "甘");
-        PLATE_FOUR_CODE_MAP.put("35",   "闽");   PLATE_FOUR_CODE_MAP.put("54",   "藏");
-        PLATE_FOUR_CODE_MAP.put("52",   "贵");   PLATE_FOUR_CODE_MAP.put("21",   "辽");
-        PLATE_FOUR_CODE_MAP.put("50",   "渝");   PLATE_FOUR_CODE_MAP.put("61",   "陕");
-        PLATE_FOUR_CODE_MAP.put("63",   "青");   PLATE_FOUR_CODE_MAP.put("23",   "黑");
-    }
-
     /**
      * 遍历费用属性描述文字
      *
@@ -67,22 +40,16 @@ public class BuildDescUtils {
             } else if ("radio".equals(attrType)) {
                 desc.append(radioIdentifying(ptlAgreementUndwrtRulesAttr, link)).append(";\t\t");
             } else if ("checkbox".equals(attrType) || "select".equals(attrType)) {
-                if(link.getMinArray() != null && link.getMinArray().length > 0){
+                if (link.getMinArray() != null && link.getMinArray().length > 0) {
                     desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含");
-                    for (int k=0 ; k<link.getMinArray().length; k++){
-                        PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = null;
-                        for (PtlAgreementUndwrtRulesDictLabal x : link.getDictLabal()) {
-                            if (Arrays.asList(link.getMinArray()).contains(x.getCode())) {
-                                ptlAgreementUndwrtRulesDictLabal = x;
-                                link.getMinArray()[k] = null;
-                                break;
-                            }
+                    for (PtlAgreementUndwrtRulesDictLabal labal : link.getDictLabal()) {
+                        if (Arrays.asList(link.getMinArray()).contains(labal.getCode())) {
+                            desc.append(null != labal ? labal.getName() : "").append("，");
                         }
-                        desc.append(null != ptlAgreementUndwrtRulesDictLabal ? ptlAgreementUndwrtRulesDictLabal.getName() : "").append("，");
                     }
                     // 条件描述后补充一个分号
                     desc.append("，");
-                }else {
+                } else {
                     desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append(";\t\t");
                 }
             } else if ("inputTag".equals(attrType)) {
@@ -196,15 +163,6 @@ public class BuildDescUtils {
                         .filter(x -> x.getCode() != null && x.getCode().equals(item)).findAny().orElse(null);
                 if (ptlAgreementUndwrtRulesDictLabal != null) {
                     returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName()).append(",");
-                } else {
-                    // 车牌号  车牌地区
-                    if (ptlAgreementProductCostsAttrLink.getAttrCode().equals("LicenseNo") || ptlAgreementProductCostsAttrLink.getAttrCode().equals("LicenseArea")) {
-                        returnMsg.append(PLATE_FOUR_CODE_MAP.getOrDefault(item, item)).append(",");
-                    }
-                    // 车辆用途
-                    if (ptlAgreementProductCostsAttrLink.getAttrCode().equals("VehicleUseCode")) {
-                        returnMsg.append(VehicleUseCode.getByCode(item)).append(",");
-                    }
                 }
             }
         }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1533,6 +1533,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
            }
            // 关联用户角色
            saveRole(userByUserId);
+            // 合伙人添加业务员    app内也要新增一条数据
+           saveUserApp(userByUserId, userByUserId.getSystemCode());
            return HttpResult.ok("添加业务员成功");
        }catch (Exception e){
            log.error("添加业务员异常",e);
@@ -1540,6 +1542,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
        }
     }
 
+    private void saveUserApp(SysUserJzgInfo userByUserId, String systemCode) {
+        boolean exists = sysUserJzgAppMapper.exists(new LambdaQueryWrapper<>(SysUserJzgApp.class).eq(SysUserJzgApp::getUserId, userByUserId.getUserId()));
+        if (!exists){
+            SysUserJzgApp sysUserJzgApp = BeanUtil.copyProperties(userByUserId, SysUserJzgApp.class);
+            sysUserJzgApp.setId(IdGenerate.nextId());
+            sysUserJzgApp.setSystemCode(systemCode);
+            sysUserJzgAppMapper.insert(sysUserJzgApp);
+        }
+    }
+
     @Override
     public HttpResult<SysUserJzgInfo> getUserInfoUserId(String userId) {
         return HttpResult.ok(sysUserJzgInfoMapper.getUserJzgInfoByUserId(userId));
@@ -1569,6 +1581,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public void addPartner(SysUserVo sysUserVo){
         String referrerId = sysUserVo.getReferrerId();
+        if (StringUtils.isEmpty(referrerId)){
+            throw new SystemException("推荐人不能为空");
+        }
         SysUser sysUser = baseMapper.getUserByMobile(sysUserVo.getMobile());
         if (sysUserVo.isCodeInvitation()){
             SysUserJzgInfo userJzgInfo = sysUserJzgInfoMapper.selectByUserIdInfo(sysUserVo.getReferrerId());
@@ -1613,6 +1628,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             sysUserVo.setUserId(sysUserJzgInfo.getId());
         }
+        if (sysUserVo.getGrade() > 3){
+            saveUserApp(sysUserJzgInfo, baseController.getSystemCode());
+        }
         partnerAddsSalespersonIdentity(sysUserJzgInfo.getId(),"3");
         if ((!Objects.isNull(sysUserVo.getGrade()) && 4 == sysUserVo.getGrade())){
             SysOrganizationAdd organizationAdd = new SysOrganizationAdd();