From 4882a0016894ab7c25506498d51030c0886007d9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 15:33:30 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..d82c262 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);
@@ -648,7 +658,8 @@
//新增【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
followTraderInfoEntity.setMemberId(memberId);
- followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
+ followTraderInfoEntity.setProfitRatio(BigDecimal.valueOf(0.1));
+// followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
String phone = memberEntity.getPhone();
String email = memberEntity.getEmail();
if(StrUtil.isNotEmpty(phone)) {
@@ -860,7 +871,7 @@
myFollowOrderVo.setLeverRatio(leverRatio);
BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardAmount(rewardAmount);
- BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardRatio(rewardRatio);
int symbolCnt = contractOrderEntity.getSymbolCnt();
myFollowOrderVo.setSymbolCnt(symbolCnt);
--
Gitblit v1.9.1