更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RegisterUserAccountParam.java

@@ -21,9 +21,12 @@ public class RegisterUserAccountParam {
     @Schema(description = "用户手机号")
     private String phone;
 
-    @Schema(description = "姓名")
+    @Schema(description = "昵称")
     private String name;
 
+    @Schema(description = "真实姓名")
+    private String realName;
+
     @Schema(description = "证件号码")
     private String cardNumber;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountModel.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author TRX
@@ -31,6 +32,16 @@ public class UserCountModel extends SuperModel {
     @Schema(description = "姓名")
     private String name;
 
+    @Schema(description = "真实姓名")
+    private String realName;
+
+    public String getRealName(){
+        if (StringUtils.isNotEmpty(realName)) {
+            return realName;
+        }
+        return name;
+    }
+
     @Schema(description = "用户名  用户真实姓名的拼音")
     private String spellCode;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/DateUtils.java

@@ -42,6 +42,8 @@ public class DateUtils {
 
     public final static String patternWx  = "yyyy-MM-dd'T'HH:mm:ssXXX";
 
+    public final static String unionAuth = "yyyyMMddHHmmss";
+
     public static Long timeToLong(String time) {
         return timeToLong(time, FORMAT_LONG);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/UserAccount.java

@@ -32,10 +32,13 @@ public class UserAccount extends SuperMain {
     @Schema(description = "用户手机号")
     private String phone;
 
-    @Schema(description = "姓名")
+    @Schema(description = "昵称")
     @Indexed
     private String name;
 
+    @Schema(description = "真实姓名")
+    private String realName;
+
     @Schema(description = "用户名  用户真实姓名的拼音")
     @Indexed
     private String spellCode;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/UserAccountServiceImpl.java

@@ -281,8 +281,12 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             }
 
             userAccount = new UserAccount();
-
             BeanUtils.copyProperties(param, userAccount);
+            String realName = param.getRealName();
+            if (StringUtils.isEmpty(realName)) {
+                realName = param.getName();
+            }
+            userAccount.setRealName(realName);
             userAccount.setUserId(userId);
             userAccount.setLoginType(UserLoginType.All);
             userAccount.setOid(null);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -262,22 +262,24 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
         // 保存卡片信息
         List<CardInfoParam> cardInfos = param.getCardInfos();
 
-        HashMap<String, String> map = new HashMap<>();
-        for (CardInfoParam cardInfo : cardInfos) {
-            if (cardInfo.getCardType() == null) {
-                return ResultContent.buildFail("卡片类型不能为空");
-            }
-            if (StringUtils.isEmpty(cardInfo.getCode())) {
-                return ResultContent.buildFail("code不能为空");
-            }
-            if (map.containsKey(cardInfo.getCode())) {
-                return ResultContent.buildFail(String.format("code已存在：%s", cardInfo.getCode()));
-            }
-            map.put(cardInfo.getCode(), cardInfo.getCode());
+        if (ObjectUtils.isNotEmpty(cardInfos)) {
+            HashMap<String, String> map = new HashMap<>();
+            for (CardInfoParam cardInfo : cardInfos) {
+                if (cardInfo.getCardType() == null) {
+                    return ResultContent.buildFail("卡片类型不能为空");
+                }
+                if (StringUtils.isEmpty(cardInfo.getCode())) {
+                    return ResultContent.buildFail("code不能为空");
+                }
+                if (map.containsKey(cardInfo.getCode())) {
+                    return ResultContent.buildFail(String.format("code已存在：%s", cardInfo.getCode()));
+                }
+                map.put(cardInfo.getCode(), cardInfo.getCode());
 
-            CardInfo cardInfo1 = cardInfoDao.findByCode(cardInfo.getCode());
-            if (ObjectUtils.isNotEmpty(cardInfo1)) {
-                return ResultContent.buildFail(String.format("卡号code已存在：%s", cardInfo.getCode()));
+                CardInfo cardInfo1 = cardInfoDao.findByCode(cardInfo.getCode());
+                if (ObjectUtils.isNotEmpty(cardInfo1)) {
+                    return ResultContent.buildFail(String.format("卡号code已存在：%s", cardInfo.getCode()));
+                }
             }
         }
 
@@ -299,6 +301,7 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
             return ResultContent.buildFail(resultContent.getMsg());
         }
 
+        // 添加卡片
         String userId = resultContent.getContent();
         if (ObjectUtils.isNotEmpty(cardInfos)) {
             for (CardInfoParam cardInfo : cardInfos) {