From c7d94b1950e630b0fef5ea4c2cb2a6af92c8d140 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Jun 2020 16:49:46 +0800
Subject: [PATCH] 20200612 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 4 ++--
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 1 -
src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java | 6 +++---
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 7f14be4..617e23c 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -373,7 +373,6 @@
memberAccountMoneyChange.setMemberId(memberId);
IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletContractRecordsInPage(page, memberAccountMoneyChange);
Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = MemberAccountMoneyChangeMapper.INSTANCE.pageEntityToPageVo(list);
-
return Result.ok(pageEntityToPageVo);
}
diff --git a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
index a6dbf07..68c095d 100644
--- a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
+++ b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
@@ -42,9 +42,9 @@
MemberEntity member = LoginUserUtils.getAppLoginUser();
log.info("查询到的会员----->{}", member);
// 验证是否实名认证
- if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
- return Result.fail("请先实名认证");
- }
+ //if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
+ // return Result.fail("请先实名认证");
+ //}
String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();
// 验证支付密码
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index df42ced..9489f9c 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -45,7 +45,7 @@
/**
* 实名认证 审核通过
*/
- public static final Integer CERTIFY_STATUS_Y = 1;
+ public static final Integer CERTIFY_STATUS_Y = 2;
/**
* 实名认证 审核不通过
*/
@@ -53,7 +53,7 @@
/**
* 实名认证 审核中
*/
- public static final Integer CERTIFY_STATUS_ING = 2;
+ public static final Integer CERTIFY_STATUS_ING = 1;
/**
* 实名认证 未提交
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java
index e1ffeda..3429992 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java
@@ -8,7 +8,7 @@
@ApiModel(value = "MemberAuthenticationInfoVo", description = "实名认证信息")
public class MemberAuthenticationInfoVo {
- @ApiModelProperty(value = "实名认证状态 0-审核未通过 1-审核通过 2-等待审核")
+ @ApiModelProperty(value = "实名认证状态 0-审核未通过 1-审核中 2-审核通过")
private Integer certifyStatus;
@ApiModelProperty(value = "姓")
--
Gitblit v1.9.1