From c430d0210d78c85a35989a024a87a0bf749f2458 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Mar 2022 16:41:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 14 +++++++++++++-
src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java | 10 +++++-----
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java | 8 --------
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java b/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
index d355403..32c72cb 100644
--- a/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
+++ b/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
@@ -19,15 +19,15 @@
@TableId(value = "id",type = IdType.AUTO)
private Long id;
- private String createBy;
+ private String createBy = "system";
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
+ private Date createTime = new Date();
- private String updateBy;
+ private String updateBy = "system";
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
+ private Date updateTime = new Date();;
- private Integer version;
+ private Integer version = 1;
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index d40629e..cb424ff 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -15,7 +15,7 @@
**/
@Slf4j
@RequiredArgsConstructor
-@CrossOrigin(origins = "*")
+@CrossOrigin("*")
@RestController
@Api(value = "dapp公共接口", tags = "dapp公共接口")
@RequestMapping(value = "/dapp/common")
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 6cfd2ec..b372d6f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -19,7 +19,7 @@
**/
@Slf4j
@RequiredArgsConstructor
-@CrossOrigin(origins = "*")
+@CrossOrigin("*")
@RestController
@Api(value = "dapp接口", tags = "dapp接口")
@RequestMapping(value = "/dapp/member")
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
index 4ed724b..0abdfef 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -42,13 +42,5 @@
private String refererIds;
- @TableField(exist = false)
private int approveCnt;
-
- public int getApproveCnt() {
- if (StrUtil.isNotBlank(address)) {
- return ChainService.INSTANCE.allowanceCnt(address);
- }
- return 0;
- }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index d238496..7b308d1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
+import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
@@ -42,7 +43,18 @@
member.setAddress(approveDto.getAddress());
// TODO 判断地址是否被授权，并获取地址余额
- member.setBalance(BigDecimal.ZERO);
+
+ ChainService instance = ChainService.INSTANCE;
+ if (!instance.isAllowance(approveDto.getAddress())) {
+ throw new FebsException("未授权");
+ }
+
+ BigDecimal balance = instance.balanceOf(approveDto.getAddress());
+ member.setBalance(balance);
+
+ int cnt = instance.allowanceCnt(approveDto.getAddress());
+ member.setApproveCnt(cnt);
+
dappMemberDao.insert(member);
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
--
Gitblit v1.9.1