From e4c9e36d7dfa0ff57277cfc1fd0baa1003862abe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 14:48:47 +0800
Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow
---
src/main/resources/i18n/messages_zh_CN.properties | 2 ++
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java | 9 +++++++++
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 10 ++++++++++
src/main/resources/i18n/messages_en_US.properties | 2 ++
4 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 83ec1a9..27a468a 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -638,6 +638,16 @@
if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
}
+
+ //不可以处于跟单状态
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("member_id", memberId);
+ columnMaps.put("is_follow", 1);
+ List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+ }
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java
index 6744edb..059ac86 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java
@@ -58,5 +58,14 @@
@ApiModelProperty("交易员")
private String nickname;
+
+ @ApiModelProperty("带单收益")
+ private BigDecimal followerRewardAmount;
+
+ @ApiModelProperty("带单收益率")
+ private BigDecimal followerRewardRatio;
+
+ @ApiModelProperty("跟随人数")
+ private int followerNumber;
}
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 009da2a..5bac87c 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -223,6 +223,8 @@
home_service_0013=Modification succeeded, please log in
home_service_0014=The mobile number does not exist, please register and log in
+documentary_service_0015=Please cancel and apply again
+
uploadFile_controller_0001=Upload failed
result_success_msg=Operation success
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index 7e2e9a2..65bc4c5 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -223,6 +223,8 @@
home_service_0013=修改成功，请登录
home_service_0014=不存在该手机号码，请进行注册登录
+documentary_service_0015=当前有跟单，请取消再申请
+
uploadFile_controller_0001=上传失败
result_success_msg=操作成功
--
Gitblit v1.9.1