From 3d7c4845ebf9ae81f1121d0c7360869e2c419cf7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 May 2021 10:12:13 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/test/java/com/xcong/excoin/XchTest.java | 19 ++++
src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java | 1
src/main/resources/application-test.yml | 11 +-
pom.xml | 6
src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java | 3
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 7 +
src/main/resources/mapper/yunding/YdOrderDao.xml | 6 +
src/main/java/com/xcong/excoin/modules/yunding/service/XchProfitService.java | 9 ++
src/main/resources/mapper/member/MemberDao.xml | 19 ++++
src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java | 3
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 89 ++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java | 1
src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java | 28 +++++++
src/main/java/com/xcong/excoin/utils/LogRecordUtils.java | 5 +
14 files changed, 199 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index f1078c1..233d37d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.xcong</groupId>
- <artifactId>excoin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>excoin</name>
+ <artifactId>yunding</artifactId>
+ <version>1.0.0</version>
+ <name>yunding</name>
<description>Demo project for Spring Boot</description>
<properties>
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
index ad95e15..6e2716a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
@@ -23,4 +23,5 @@
public List<MemberEntity> selectAllMember();
+ List<MemberEntity> selectYdParentAgent(@Param("list") List<String> list);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index e958f59..023a18b 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -1,7 +1,10 @@
package com.xcong.excoin.modules.member.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
+import com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity;
+import com.xcong.excoin.modules.yunding.entity.YdBasicSettingEntity;
import lombok.Data;
import java.math.BigDecimal;
@@ -192,4 +195,8 @@
public static final Integer PCSTATE_Y = 0;
public static final Integer PCSTATE_N = 1;
+
+ @TableField(exist = false)
+ private YdBasicLevelSettingEntity ydBasicLevelSettingEntity;
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
index 1ed46d4..bc94fec 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
@@ -8,8 +8,11 @@
import com.xcong.excoin.modules.yunding.vo.YdOrderVo;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface YdOrderDao extends BaseMapper<YdOrderEntity> {
IPage<YdOrderVo> getOrderList(Page<YdOrderVo> page, @Param("record") YdOrderEntity ydOrderEntity);
+ List<YdOrderEntity> selectNeedReturnOrders();
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java
new file mode 100644
index 0000000..610e29d
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java
@@ -0,0 +1,28 @@
+package com.xcong.excoin.modules.yunding.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("yd_basic_level_setting")
+public class YdBasicLevelSettingEntity {
+
+ private Long id;
+
+ private String name;
+
+ private String code;
+
+ private BigDecimal xchRatio;
+
+ private BigDecimal usdtRatio;
+
+ private BigDecimal chargeUsdt;
+
+ private BigDecimal calculationPower;
+
+ private Integer level;
+}
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 c99efc0..28aaa4e 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.yunding.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -92,5 +93,7 @@
private Date endTime;
+ @TableField(exist = false)
+ private YdProductEntity ydProductEntity;
}
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
new file mode 100644
index 0000000..3302885
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -0,0 +1,89 @@
+package com.xcong.excoin.modules.yunding.service.Impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
+import com.xcong.excoin.modules.member.dao.MemberDao;
+import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
+import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
+import com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity;
+import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
+import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.utils.LogRecordUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class XchProfitServiceImpl implements XchProfitService {
+
+ @Autowired
+ private MemberDao memberDao;
+
+ @Autowired
+ private YdOrderDao ydOrderDao;
+
+ @Autowired
+ private MemberWalletCoinDao memberWalletCoinDao;
+
+ @Override
+ public void autoBeAgent(Long id) {
+
+ }
+
+ @Override
+ public void agentProfitDistributor() {
+ List<YdOrderEntity> orders = ydOrderDao.selectNeedReturnOrders();
+
+ if (CollUtil.isNotEmpty(orders)) {
+ for (YdOrderEntity order : orders) {
+ MemberEntity memberEntity = memberDao.selectById(order.getMemberId());
+ List<String> inviteIds = StrUtil.split(memberEntity.getRefererIds(), ',');
+ List<MemberEntity> agents = memberDao.selectYdParentAgent(inviteIds);
+
+ if (CollUtil.isNotEmpty(agents)) {
+ Map<Long, BigDecimal> returnRatio = new HashMap<Long, BigDecimal>();
+ Long lastId = null;
+ for (MemberEntity agent : agents) {
+ YdBasicLevelSettingEntity settingEntity = agent.getYdBasicLevelSettingEntity();
+ if(settingEntity.getLevel() == 1) {
+ if (CollUtil.isNotEmpty(returnRatio)) {
+ BigDecimal lastRatio = returnRatio.get(lastId);
+ returnRatio.put(agent.getId(), settingEntity.getUsdtRatio().subtract(lastRatio));
+ } else {
+ returnRatio.put(agent.getId(), settingEntity.getUsdtRatio());
+ }
+ break;
+ }
+
+ if (CollUtil.isEmpty(returnRatio)) {
+ lastId = agent.getId();
+ returnRatio.put(agent.getId(), settingEntity.getUsdtRatio());
+ }
+ }
+
+ for (Map.Entry<Long, BigDecimal> entry : returnRatio.entrySet()) {
+ String conent = "USDT返利";
+ BigDecimal amount = order.getAmount().multiply(entry.getValue());
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(entry.getKey(), conent, amount, "USDT", 1, 6, order.getId());
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(entry.getKey(), "USDT");
+
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), amount, BigDecimal.ZERO, 0);
+ }
+
+ YdOrderEntity updateOrder = new YdOrderEntity();
+ updateOrder.setReturnState(2);
+ updateOrder.setId(order.getId());
+ ydOrderDao.updateById(updateOrder);
+ }
+ }
+
+ }
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/XchProfitService.java b/src/main/java/com/xcong/excoin/modules/yunding/service/XchProfitService.java
new file mode 100644
index 0000000..707c990
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/XchProfitService.java
@@ -0,0 +1,9 @@
+package com.xcong.excoin.modules.yunding.service;
+
+public interface XchProfitService {
+
+ void autoBeAgent(Long id);
+
+ void agentProfitDistributor();
+
+}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
index 4014f9d..b829951 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
@@ -61,6 +61,7 @@
// 模拟浏览器
String userAgent = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.66 Safari/537.36";
try {
+ System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
URL request = new URL(url);
HttpURLConnection connection = (HttpURLConnection) request.openConnection();
connection.setRequestMethod("GET");
diff --git a/src/main/java/com/xcong/excoin/utils/LogRecordUtils.java b/src/main/java/com/xcong/excoin/utils/LogRecordUtils.java
index 3a551f5..16d42e0 100644
--- a/src/main/java/com/xcong/excoin/utils/LogRecordUtils.java
+++ b/src/main/java/com/xcong/excoin/utils/LogRecordUtils.java
@@ -26,6 +26,10 @@
public class LogRecordUtils {
public static void insertMemberAccountMoneyChange(Long memberId, String content, BigDecimal amount, String symbol, Integer status, Integer type) {
+ insertMemberAccountMoneyChangeWithId(memberId, content, amount, symbol, status, type, null);
+ }
+
+ public static void insertMemberAccountMoneyChangeWithId(Long memberId, String content, BigDecimal amount, String symbol, Integer status, Integer type, Long withId) {
MemberAccountMoneyChange accountRecord = new MemberAccountMoneyChange();
accountRecord.setContent(content);
accountRecord.setMemberId(memberId);
@@ -33,6 +37,7 @@
accountRecord.setStatus(status);
accountRecord.setSymbol(symbol);
accountRecord.setType(type);
+ accountRecord.setWithdrawId(withId);
SpringContextHolder.getBean(MemberAccountMoneyChangeDao.class).insert(accountRecord);
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index d0ac682..3e9a6f4 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -5,7 +5,7 @@
spring:
profiles:
- active: dev
+ active: test
datasource:
url: jdbc:mysql://120.27.238.55:3306/yunding_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: ct_test
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 0
+ database: 3
## Redis服务器地址
- host: 114.55.92.106
+ host: 121.37.162.173
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: hibit123
+ password: d32ncxe@i3#!dV
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -98,9 +98,10 @@
#日线 该任务不能与最新价处于同一个服务器
day-line: true
other-job: true
- loop-job: true
+ loop-job: false
rabbit-consumer: false
block-job: true
+ xch-job: true
aliyun:
oss:
diff --git a/src/main/resources/mapper/member/MemberDao.xml b/src/main/resources/mapper/member/MemberDao.xml
index 27fb5e7..a16cad1 100644
--- a/src/main/resources/mapper/member/MemberDao.xml
+++ b/src/main/resources/mapper/member/MemberDao.xml
@@ -49,4 +49,23 @@
<select id="selectAllMember" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
select * from member
</select>
+
+ <resultMap id="memberAgentMap" type="com.xcong.excoin.modules.member.entity.MemberEntity">
+ <id property="id" column="id" />
+
+ <association property="ydBasicLevelSettingEntity" javaType="com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity">
+ <result property="level" column="level"/>
+ <result property="usdtRatio" column="usdt_ratio" />
+ </association>
+ </resultMap>
+
+ <select id="selectYdParentAgent" resultMap="memberAgentMap">
+ select a.*, b.level, b.usdt_ratio from member a
+ inner join yd_basic_level_setting b on a.agent_level=b.id
+ where a.invite_id in
+ <foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
+ #{item}
+ </foreach >
+ order by id desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index e633040..f8c2e8a 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -21,4 +21,10 @@
ORDER BY a.create_time DESC
</select>
+ <select id="selectNeedReturnOrders" resultType="com.xcong.excoin.modules.yunding.entity.YdOrderEntity">
+ select a.*, b.* from yd_order a
+ left join yd_product b on a.product_id=b.id
+ where a.state=2 and a.return_state=1
+ </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
new file mode 100644
index 0000000..bdde057
--- /dev/null
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -0,0 +1,19 @@
+package com.xcong.excoin;
+
+
+import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class XchTest {
+
+ @Autowired
+ private XchProfitService xchProfitService;
+
+ @Test
+ public void usdtReturnTest() {
+ xchProfitService.agentProfitDistributor();
+ }
+}
--
Gitblit v1.9.1