From 72b7d6b5ac0e3e4804886382bcada61e7469e9d0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 03 Jun 2021 14:59:59 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index ed4c0eb..b826d9f 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -325,7 +325,7 @@
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
-// Long memberId = 442L;
+// Long memberId = 447L;
OrderAllInfoVo orderAllInfoVo = new OrderAllInfoVo();
DecimalFormat decimalFormat = new DecimalFormat("0.0000#");
//历史总收益
@@ -351,7 +351,12 @@
if(CollUtil.isNotEmpty(PowerNowQuery)){
for(YdOrderEntity order : PowerNowQuery){
int quantity = order.getQuantity();
- powerNow = powerNow + quantity;
+ Long productId = order.getProductId();
+ YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
+ if("XCH".equals(ydProductEntity.getCoin())){
+ Integer proNum = ydProductEntity.getProNum();
+ powerNow = powerNow + quantity*proNum;
+ }
}
}
orderAllInfoVo.setPowerNow(powerNow);
@@ -365,7 +370,12 @@
if(CollUtil.isNotEmpty(powerReradyQuerys)){
for(YdOrderEntity order : powerReradyQuerys){
int quantity = order.getQuantity();
- powerReady = powerReady + quantity;
+ Long productId = order.getProductId();
+ YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
+ if("XCH".equals(ydProductEntity.getCoin())){
+ Integer proNum = ydProductEntity.getProNum();
+ powerReady = powerReady + quantity*proNum;
+ }
}
}
orderAllInfoVo.setPowerReady(powerReady);
@@ -643,7 +653,7 @@
for(YdOrderEntity ydOrderEntity : ydOrderEntitys){
Long productId = ydOrderEntity.getProductId();
YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
- if(ydProductEntity.getCoin() == "XCH"){
+ if("XCH".equals(ydProductEntity.getCoin())){
Integer proNum = ydProductEntity.getProNum();
Integer quantity = ydOrderEntity.getQuantity();
allPower = allPower + proNum*quantity;
@@ -675,7 +685,7 @@
for(YdOrderEntity ydOrderEntity : ydOrderEntityLevel){
Long productId = ydOrderEntity.getProductId();
YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
- if(ydProductEntity.getCoin() == "XCH"){
+ if("XCH".equals(ydProductEntity.getCoin())){
Integer proNum = ydProductEntity.getProNum();
Integer quantity = ydOrderEntity.getQuantity();
powerNum = powerNum + proNum*quantity;
--
Gitblit v1.9.1