From 33f1144eb7c357232f8ca4250b03ae752b7cae9d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 15:20:55 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 3 ++-
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 | 2 +-
4 files changed, 11 insertions(+), 2 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 b18888d..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
@@ -263,7 +263,7 @@
@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) {
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index d3c69b9..c031f39 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -48,6 +48,7 @@
<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>
@@ -93,7 +94,7 @@
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
*
--
Gitblit v1.9.1