From 9c8214358fc62aae6f610bdf0c6f3d49ddfbe266 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 14:57:20 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 4 ++--
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
index 595f030..b18888d 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -103,9 +103,9 @@
if (CollUtil.isNotEmpty(orders)) {
for (YdOrderEntity order : orders) {
if ("P".equals(order.getYdProductEntity().getProUnit())) {
- totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * 1024));
+ totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum() * 1024));
} else {
- totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity()));
+ totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum()));
}
}
}
@@ -267,7 +267,7 @@
if (CollUtil.isNotEmpty(products)) {
BigDecimal totalCount = BigDecimal.ZERO;
for (YdProductEntity product : products) {
- BigDecimal count = product.getTotalT();
+ BigDecimal count = product.getTotalT().multiply(BigDecimal.valueOf(product.getProNum()));
if ("P".equals(product.getProUnit())) {
count = count.multiply(BigDecimal.valueOf(1024));
}
@@ -294,7 +294,7 @@
List<String> inviteIds = StrUtil.split(memberEntity.getRefererIds(), ',');
List<MemberEntity> agents = memberDao.selectYdParentAgent(inviteIds);
- BigDecimal count = BigDecimal.valueOf(order.getQuantity());
+ BigDecimal count = BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum());
if ("P".equals(order.getYdProductEntity().getProUnit())) {
count = count.multiply(BigDecimal.valueOf(1024));
}
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 5ae37ff..d3c69b9 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -52,7 +52,7 @@
</resultMap>
<select id="selectAllValidOrders" resultMap="orderMap">
- select a.*, b.id p_id, b.pro_unit, b.manage_expense from yd_order a
+ select a.*, b.id p_id, b.pro_unit, b.pro_num, b.manage_expense from yd_order a
inner join yd_product b on a.product_id=b.id
where a.state=2 and a.type = 1
</select>
@@ -90,7 +90,7 @@
</update>
<select id="selectTeamAllPower" resultMap="orderMap">
- select a.*, c.id p_id, c.pro_unit
+ select a.*, c.id p_id, c.pro_unit, c.pro_num
from yd_order a
inner join (select * from member a where find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId}) b on a.member_id=b.id
inner join yd_product c on c.id = a.product_id
--
Gitblit v1.9.1