Merge branch 'refs/heads/dev-caomeihuizhang' into container-test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamCaomeiBadgeController.java

@@ -33,7 +33,7 @@ public class AdamCaomeiBadgeController extends BaseController {
     private final String prefix = "zhengzai/adam/caomei/badge";
 
     private static final int BADGE_NAME_MAX_CHARS = 20;
-    private static final int BADGE_SUBTITLE_MAX_CHARS = 20;
+    private static final int BADGE_SUBTITLE_MAX_CHARS = 10;
 
     @Autowired
     private IAdamCaomeiBadgeAdminService adamCaomeiBadgeAdminService;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_add.html

@@ -16,7 +16,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">徽章副标题：</label>
             <div class="col-sm-8">
-                <input name="subTitle" class="form-control" type="text" maxlength="20" placeholder="最多20个字">
+                <input name="subTitle" class="form-control" type="text" maxlength="10" placeholder="最多10个字">
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_edit.html

@@ -17,7 +17,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">徽章副标题：</label>
             <div class="col-sm-8">
-                <input name="subTitle" th:field="*{subTitle}" class="form-control" type="text" maxlength="20" placeholder="最多20个字">
+                <input name="subTitle" th:field="*{subTitle}" class="form-control" type="text" maxlength="10" placeholder="最多10个字">
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamCaomeiBadge.java

@@ -34,7 +34,7 @@ public class AdamCaomeiBadge implements Serializable {
     private String name;
 
     /**
-     * 徽章副标题（最多20字）
+     * 徽章副标题（最多10字）
      */
     private String subTitle;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -445,6 +446,15 @@ public class AdamUserServiceImpl implements IAdamUserService {
 //            adamRdmService.setCertification(1, idCard, name);
 //        }
 //        adamRdmService.identityHandler1(uid, name, idCard);
+        // 优先校验身份证是否已绑定其他账号（需要优先于三方三要素校验提示）
+        if (StringUtils.isNotBlank(idCard)) {
+            String boundUid = adamRdmService.getRealNameBoundUidByIdCard(idCard);
+            if (StringUtils.isNotBlank(boundUid) && !boundUid.equals(uid)) {
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10614");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            }
+        }
+
         adamRdmService.identityHandler3(name, idCard, mobile);
 
         AdamRealName realName = new AdamRealName();