From c1c37067a3ffbcb430b96f393778901a4ef6dcc4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 19:37:02 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 7 ++++---
src/test/java/com/xcong/excoin/XchTest.java | 22 +++++++++++++++++++---
src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java | 5 +++++
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 8 ++++++++
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
index 28aaa4e..d7b7a3f 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
@@ -96,4 +96,9 @@
@TableField(exist = false)
private YdProductEntity ydProductEntity;
+ private Integer type;
+ public static final Integer AGENT_ORDER = 2;
+ public static final Integer PRODUCT_ORDER = 1;
+
+
}
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 8fddea0..02c54a4 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
@@ -230,6 +230,7 @@
ydOrderEntity.setTotalProfit(BigDecimal.ZERO);
ydOrderEntity.setTodayProfit(BigDecimal.ZERO);
ydOrderEntity.setState(YdOrderEntity.ORDER_STATE_READY);
+ ydOrderEntity.setType(YdOrderEntity.PRODUCT_ORDER);
Date date = DateUtil.date();
ydOrderEntity.setBuyTime(date);
//上架天数
@@ -537,12 +538,19 @@
//更新用户的代理级别
ydOrderDao.updateAgentLevel(memberId,Integer.parseInt(id.toString()));
+ YdOrderEntity orderEntity = new YdOrderEntity();
+ orderEntity.setType(YdOrderEntity.AGENT_ORDER);
+ orderEntity.setMemberId(memberId);
+ orderEntity.setAmount(salePrice);
+ ydOrderDao.insert(orderEntity);
+
LogRecordUtils.insertMemberAccountMoneyChangeWithId(memberId, "购买代理", salePrice,
"USDT", 1, 8, memberId);
memberEntity.setAgentLevel(id.intValue());
LoginUserUtils.resetAppLoginUser(memberEntity);
yunDingProducter.sendYunDingAutoAgent(memberId);
+ yunDingProducter.sendYunDingUsdtProfit(orderEntity.getId());
return Result.ok("购买成功");
}
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 845cc1d..b5b1d61 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -9,10 +9,11 @@
*
FROM
yd_order a
- left join yd_product b on b.id = a.product_id
+ inner join yd_product b on b.id = a.product_id
<if test="record != null">
<where>
and a.member_id = #{record.memberId}
+ and a.type=1
<if test="record.state != null" >
and a.state=#{record.state}
</if>
@@ -67,7 +68,7 @@
*
FROM
yd_order a
- left join yd_product b on b.id = a.product_id
+ inner join yd_product b on b.id = a.product_id
where a.member_id = #{memberId}
and a.id = #{id}
</select>
@@ -91,6 +92,6 @@
select a.*, c.id p_id, c.pro_unit
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
- left join yd_product c on c.id = a.product_id
+ inner join yd_product c on c.id = a.product_id
</select>
</mapper>
\ No newline at end of file
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index 1a70038..be438a4 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -3,11 +3,15 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
+import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
import com.xcong.excoin.modules.yunding.service.XchProfitService;
import com.xcong.excoin.quartz.job.YdPowerJob;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+
+import java.math.BigDecimal;
@SpringBootTest
public class XchTest {
@@ -36,12 +40,24 @@
public void orderUsdtProfitTest() {
xchProfitService.usdtProfitDistributorByOrderId(7L);
}
+//
+// @Autowired
+// private YdPowerJob ydPowerJob;
+//
+// @Test
+// public void ydPowerTest() {
+// ydPowerJob.orderWork();
+// }
@Autowired
- private YdPowerJob ydPowerJob;
+ private YdOrderDao ydOrderDao;
@Test
- public void ydPowerTest() {
- ydPowerJob.orderWork();
+ public void orderTest() {
+ YdOrderEntity orderEntity = new YdOrderEntity();
+ orderEntity.setType(YdOrderEntity.AGENT_ORDER);
+ orderEntity.setMemberId(40L);
+ orderEntity.setAmount(BigDecimal.TEN);
+ ydOrderDao.insert(orderEntity);
}
}
--
Gitblit v1.9.1