From 6a0e1564efae8aa6069bddedef749bf5c8b9b0c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 15:52:36 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 9 +++++----
src/test/java/com/xcong/excoin/XchTest.java | 2 +-
src/main/resources/mapper/yunding/YdProductDao.xml | 4 ++++
src/main/java/com/xcong/excoin/modules/yunding/dao/YdProductDao.java | 4 ++++
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 10 +++++-----
5 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdProductDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdProductDao.java
index 22d5529..48cd0f0 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdProductDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdProductDao.java
@@ -8,9 +8,13 @@
import com.xcong.excoin.modules.yunding.vo.YdProductVo;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface YdProductDao extends BaseMapper<YdProductEntity> {
IPage<YdProductVo> getProductList(Page<YdProductVo> page, @Param("record") YdProductListDto ydProductListDto);
YdProductVo findProductInfoById(@Param("id")Long id);
+
+ List<YdProductEntity> selectXchProductList();
}
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..16eb6ef 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()));
}
}
}
@@ -263,11 +263,11 @@
@Transactional(rollbackFor = Exception.class)
public void xchProfitDistributor(BigDecimal totalProfit) {
Date currentDate = new Date();
- List<YdProductEntity> products = ydProductDao.selectList(null);
+ List<YdProductEntity> products = ydProductDao.selectXchProductList();
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 4fed875..a9ab9ca 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -48,13 +48,14 @@
<id column="p_id" property="id" />
<result column="pro_unit" property="proUnit" />
<result column="manage_expense" property="manageExpense" />
+ <result column="pro_num" property="proNum" />
</association>
</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
+ where a.state=2 and a.type = 1 and b.coin='XCH'
</select>
<update id="UpdateByIdAndState">
@@ -90,10 +91,10 @@
</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
+ inner join yd_product c on c.id = a.product_id and c.pro_unit!='节点'
where a.type=1
</select>
diff --git a/src/main/resources/mapper/yunding/YdProductDao.xml b/src/main/resources/mapper/yunding/YdProductDao.xml
index 68fd1aa..d9bb8ab 100644
--- a/src/main/resources/mapper/yunding/YdProductDao.xml
+++ b/src/main/resources/mapper/yunding/YdProductDao.xml
@@ -4,6 +4,10 @@
<mapper namespace="com.xcong.excoin.modules.yunding.dao.YdProductDao">
+ <select id="selectXchProductList" resultType="com.xcong.excoin.modules.yunding.entity.YdProductEntity">
+ select * from yd_product where coin = 'XCH'
+ </select>
+
<select id="getProductList" resultType="com.xcong.excoin.modules.yunding.vo.YdProductVo">
select
*
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index 370729f..129b791 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -41,7 +41,7 @@
@Test
public void becomeDy() {
- xchProfitService.autoBeAgent(447L);
+ xchProfitService.autoBeAgent(444L);
}
@Test
--
Gitblit v1.9.1