From 18a8ae526fa307414267e46961ba058adba57231 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Dec 2021 17:25:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
index 57c6e7e..5b0b4be 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
@@ -40,33 +40,17 @@
throw new FebsException("该账号已被占用");
}
-// String account = registerDto.getAccount();
-// String code = registerDto.getCode();
-// boolean flags = commonService.verifyCode(account, code);
-// if(!flags) {
-// throw new FebsException("验证码错误");
-// }
-
videoMember = new VideoMemberEntity();
videoMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
- // 判断账号类型
- if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) {
- videoMember.setPhone(registerDto.getAccount());
- } else {
- videoMember.setEmail(registerDto.getAccount());
- }
-
-// Integer count = this.baseMapper.selectCount(null);
-// if (count != null && count != 0) {
-// MallMember inviteMember = this.baseMapper.selectInfoByInviteId(registerDto.getInviteId());
-// if (inviteMember == null) {
-// throw new FebsException("邀请码不存在");
-// }
-//
-// mallMember.setReferrerId(registerDto.getInviteId());
-//
+// // 判断账号类型
+// if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) {
+// videoMember.setPhone(registerDto.getAccount());
+// } else {
+// videoMember.setEmail(registerDto.getAccount());
// }
+
+ videoMember.setAccount(registerDto.getAccount());
videoMember.setName(registerDto.getAccount());
videoMember.setAccountStatus(VideoMemberEntity.ACCOUNT_STATUS_ENABLE);
videoMember.setAccountType(VideoMemberEntity.ACCOUNT_TYPE_NORMAL);
@@ -105,10 +89,6 @@
}
this.baseMapper.updateById(videoMember);
-// MallMemberWallet wallet = new MallMemberWallet();
-// wallet.setBalance(BigDecimal.ZERO);
-// wallet.setMemberId(mallMember.getId());
-// mallMemberWalletMapper.insert(wallet);
return new FebsResponse().success().message("注册成功");
}
@@ -148,4 +128,5 @@
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+
}
--
Gitblit v1.9.1