From cf0cafca18197fc93083f43c19099dd3f84a09e5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Jul 2020 18:23:20 +0800
Subject: [PATCH] 20200702 代码提交
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 4 ++--
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 3 +++
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index fb0aed5..a11e431 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -169,9 +169,9 @@
memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
- return Result.ok("提交成功"+spread+"id:"+id+"openingPrice"+openingPrice);
+ return Result.ok("提交成功");
}
- return Result.fail("提交失败"+spread+"id:"+id+"openingPrice"+openingPrice);
+ return Result.fail("提交失败");
}
@Override
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
index 1518d78..97576fc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "收款方式1:有 0没有")
private Integer memberPaymentMethod;
+
+ @ApiModelProperty(value = "实名认证0：审核不通过 1：审核中 2： 审核通过 3：未提交")
+ private Integer certifyStatus;
@ApiModelProperty(value = "交易密码时效性设置1:一直需要输入密码 2不需要输入密码")
private Integer tradeAgingSetting;
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 56ace36..b66d2fc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -734,6 +734,9 @@
MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
+ Integer certifyStatus = member.getCertifyStatus();
+ memberPersonCenterInfoVo.setCertifyStatus(certifyStatus);
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
--
Gitblit v1.9.1