feature: 同步服务完善

1.全量人员双向同步

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/domain/bo/RemoteUserAccountBo.java

@@ -113,7 +113,11 @@ public class RemoteUserAccountBo implements Serializable {
 
     private Long cardId;
 
+    /**
+     * 卡流水号
+     */
     private Long cardNo;
+
     /**
      * 用户身份（0=内部用户 1=老师 2=学生 3=家长  4=其他人员）
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -225,6 +225,7 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setUserId(add.getUserId());
+            bo.setUserNo(add.getUserNo());
         }
         return flag;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -161,9 +161,15 @@ public class SysUserBo extends TenantEntity {
     private String excludeUserIds;
 
     private Long cardId;
-
+    /**
+     * 卡流水号
+     */
     private Long cardNo;
 
+    /**
+     * 用户流水号
+     */
+    private Long userNo;
     /**
      * 创建时间
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java

@@ -180,4 +180,8 @@ public class SysUserVo implements Serializable {
      */
     private Long userNo;
 
+    /**
+     * 卡流水号
+     */
+    private Long cardNo;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -373,6 +373,7 @@ public class SysUserServiceImpl implements ISysUserService {
                     RemoteUserAccountBo data = result.getData();
                     user.setCardId(data.getCardId());
                     user.setCardNo(data.getCardNo());
+                    user.setUserNo(data.getUserNo());
                     return rows;
                 } else {
                     throw new UserException(result.getMsg());
@@ -381,7 +382,10 @@ public class SysUserServiceImpl implements ISysUserService {
                 //不自动开通
                 remoteUserAccountBo.setAccountStatus("0");
                 remoteUserAccountService.insertByBo(remoteUserAccountBo);
+                user.setUserNo(remoteUserAccountBo.getUserNo());
             }
+            SysUserVo vo = baseMapper.selectVoById(user.getUserId());
+            vo.setCardNo(user.getCardNo());
             sendCloudConsume(baseMapper.selectVoById(user.getUserId()));
             return rows;
         } catch (Exception e) {