From f51f32afcbf123872e746803388616a5fccc27b7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 05 Aug 2020 18:26:50 +0800
Subject: [PATCH] 20200805 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 14 ++++++++++++--
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java | 2 +-
2 files changed, 13 insertions(+), 3 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 f1bde06..28ba7fc 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
@@ -485,6 +485,16 @@
followFollowerProfitDao.insert(followFollowerProfitEntity);
}
} else {
+ //更新【跟随者收益】数据
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+ if (CollUtil.isNotEmpty(selectByMap)) {
+ FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.updateById(followFollowerProfitEntity);
+ }
+
isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());
isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());
isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
@@ -875,9 +885,9 @@
String phone = memberEntity.getPhone();
String email = memberEntity.getEmail();
if(StrUtil.isNotEmpty(phone)) {
- myFollowTraderInfoVo.setNickName(phone);
+ myFollowTraderInfoVo.setNickname(phone);
}else {
- myFollowTraderInfoVo.setNickName(email);
+ myFollowTraderInfoVo.setNickname(email);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
index ceca5ec..f2c0471 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
@@ -14,7 +14,7 @@
private Long id;
@ApiModelProperty("名称")
- private String nickName;
+ private String nickname;
@ApiModelProperty(value = "累计跟随本金")
private BigDecimal totalPrincipal;
--
Gitblit v1.9.1