From 130ee4ec701c05d2930c766935e32e96a6aab753 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Tue, 28 Jul 2020 19:15:45 +0800
Subject: [PATCH] 更新代码

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
index e2209a2..0fbce89 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
@@ -18,7 +18,10 @@
 import com.xcong.excoin.modules.member.entity.MemberEntity;
 import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
 import com.xcong.excoin.utils.LogRecordUtils;
-import com.xcong.excoin.utils.mail.SmsSend;
+import com.xcong.excoin.utils.ThreadPoolUtils;
+import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
+import com.xcong.excoin.utils.mail.Sms106Send;
+import com.xcong.excoin.utils.mail.SubMailSend;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -85,12 +88,14 @@
                         String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance);
                         // 插入财务记录
                         LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.USDT.name(), 1, 1);
-                        // TODO 钉钉发送, 短信提醒
 
+                        ThreadPoolUtils.sendDingTalk(5);
                         MemberEntity member = memberDao.selectById(memberId);
                         if (StrUtil.isNotBlank(member.getPhone())) {
                             String amount = newBalance.toPlainString() + "USDT-ERC20";
-                            SmsSend.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount, orderNo);
+                            Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+                        } else {
+                            SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
                         }
                     }
                 }
@@ -134,12 +139,14 @@
 
                         // 插入财务记录
                         LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.ETH.name(), 1, 1);
-                        // TODO 钉钉消息, 短信提醒
 
+                        ThreadPoolUtils.sendDingTalk(5);
                         MemberEntity member = memberDao.selectById(memberId);
                         if (StrUtil.isNotBlank(member.getPhone())) {
                             String amount = newBalance.toPlainString() + "ETH";
-                            SmsSend.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount, orderNo);
+                            Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+                        } else {
+                            SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
                         }
                     }
                 }
@@ -180,11 +187,13 @@
                         memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
                         String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance);
 
-                        // TODO 钉钉消息, 短信提醒
+                        ThreadPoolUtils.sendDingTalk(5);
                         MemberEntity member = memberDao.selectById(memberId);
                         if (StrUtil.isNotBlank(member.getPhone())) {
                             String amount = newBalance.toPlainString() + "USDT-OMNI";
-                            SmsSend.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount, orderNo);
+                            Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+                        } else {
+                            SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
                         }
                     }
                 }
@@ -227,11 +236,13 @@
                         String orderNo = insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance);
                         LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
 
-                        // TODO 钉钉提醒, 短信提醒
+                        ThreadPoolUtils.sendDingTalk(5);
                         MemberEntity member = memberDao.selectById(memberId);
                         if (StrUtil.isNotBlank(member.getPhone())) {
                             String amount = newBalance.toPlainString() + "BTC";
-                            SmsSend.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), amount, orderNo);
+                            Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+                        } else {
+                            SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
                         }
                     }
                 }

--
Gitblit v1.9.1