From ecb0acd48854233f1f4aeb8649d4db6cdf464279 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 29 Dec 2022 14:57:14 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/chain/service/UsdtErc20UpdateService.java | 2 --
src/main/resources/application-dev.yml | 10 +++++++++-
src/main/resources/application-prod.yml | 3 ++-
src/main/java/cc/mrbird/febs/common/configure/RedisConfigure.java | 3 +--
src/main/java/cc/mrbird/febs/mall/chain/service/BlockCoinServiceImpl.java | 18 ++++++++++++++++++
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
index 318552b..2031533 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
@@ -162,7 +162,7 @@
}
@Bean
public Queue mallCoinTrcUsdtUpdateQueue() {
- return new Queue(RabbitQueueEnum.MALL_COIN_TRC_USDT_UPDATE.getExchange(), true);
+ return new Queue(RabbitQueueEnum.MALL_COIN_TRC_USDT_UPDATE.getQueue(), true);
}
@Bean
public Binding mallCoinTrcUsdtUpdateBinding() {
@@ -178,7 +178,7 @@
}
@Bean
public Queue mallCoinTrcTrc20Queue() {
- return new Queue(RabbitQueueEnum.MALL_COIN_TRC_TRC20_BLOCK.getExchange(), true);
+ return new Queue(RabbitQueueEnum.MALL_COIN_TRC_TRC20_BLOCK.getQueue(), true);
}
@Bean
public Binding mallCoinTrcTrc20Binding() {
diff --git a/src/main/java/cc/mrbird/febs/common/configure/RedisConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/RedisConfigure.java
index 5977007..b1e1d47 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/RedisConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/RedisConfigure.java
@@ -27,8 +27,7 @@
Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
ObjectMapper mapper = new ObjectMapper();
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
- // todo 这个地方报错，提示方法找不到了，你也帮忙看一下
-// mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
+ mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
jackson2JsonRedisSerializer.setObjectMapper(mapper);
StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
diff --git a/src/main/java/cc/mrbird/febs/mall/chain/service/BlockCoinServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/chain/service/BlockCoinServiceImpl.java
index cbb3fc0..0660317 100644
--- a/src/main/java/cc/mrbird/febs/mall/chain/service/BlockCoinServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/chain/service/BlockCoinServiceImpl.java
@@ -1,16 +1,20 @@
package cc.mrbird.febs.mall.chain.service;
+import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.MallMoneyFlowTypeEnum;
import cc.mrbird.febs.common.utils.SubMailSend;
import cc.mrbird.febs.common.utils.ZzSmsSend;
import cc.mrbird.febs.mall.chain.dto.EthUsdtChargeDto;
import cc.mrbird.febs.mall.chain.enums.CoinTypeEnum;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
+import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.entity.MemberCoinAddressEntity;
import cc.mrbird.febs.mall.entity.MemberCoinChargeEntity;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MemberCoinAddressDao;
import cc.mrbird.febs.mall.mapper.MemberCoinChargeDao;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
@@ -43,6 +47,8 @@
private MemberCoinChargeDao memberCoinChargeDao;
@Resource
private MallMemberWalletMapper mallMemberWalletMapper;
+ @Resource
+ private IMallMoneyFlowService mallMoneyFlowService;
private final static String EOS_SEQ_KEY = "eos_seq_key";
@@ -133,6 +139,18 @@
String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.USDT.name(), "ERC20", BigDecimal.ZERO, hash);
// 插入财务记录
+
+ Long chargeFlowId = mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ orderNo,
+ balance.setScale(4, BigDecimal.ROUND_DOWN),
+ MallMoneyFlowTypeEnum.CHARGE.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ memberId,
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.CHARGE.getName()
+ );
// LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
// 同步
// try {
diff --git a/src/main/java/cc/mrbird/febs/mall/chain/service/UsdtErc20UpdateService.java b/src/main/java/cc/mrbird/febs/mall/chain/service/UsdtErc20UpdateService.java
index 6e9d0d1..711def3 100644
--- a/src/main/java/cc/mrbird/febs/mall/chain/service/UsdtErc20UpdateService.java
+++ b/src/main/java/cc/mrbird/febs/mall/chain/service/UsdtErc20UpdateService.java
@@ -66,8 +66,6 @@
private static String blockchainNode = "http://120.55.86.146:8545";
private static String contractAddr = "0xdac17f958d2ee523a2206206994597c13d831ec7";
-
-
// 操作账号
private static String privateKey = "4576fafdd215f52051c60e04618ef8997fbc5cee8413d3b34d210e296e6e9a3d";
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 9363a39..bd10014 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -19,7 +19,15 @@
password: db_mall_coin!@#123
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://154.91.195.148:3306/db_mall_coin?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-
+# redis:
+# # Redis数据库索引（默认为 0）
+# database: 0
+# # Redis服务器地址
+# host: 127.0.0.1
+# # Redis服务器连接端口
+# port: 6379
+# # Redis 密码
+# # password: dapp!@#123
redis:
# Redis数据库索引（默认为 0）
database: 0
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index e858513..213921e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -61,4 +61,5 @@
system:
- chain-listener: true
\ No newline at end of file
+# chain-listener: true
+ chain-listener: false
\ No newline at end of file
--
Gitblit v1.9.1