From 75224ce7dbf79b1bccd06a45c2c85703f4239754 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 30 十一月 2018 11:22:25 +0800
Subject: [PATCH] Merge branch 'dev-goods'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
index b07dd71..81cb001 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
@@ -10,11 +10,16 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
+import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.user.SMSService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class UserNotificationServiceImpl implements UserNotificationService {
@@ -23,6 +28,12 @@
@Resource
private PushService pushService;
+
+ @Resource
+ private SMSService smsService;
+
+ @Resource
+ private UserInfoService userInfoService;
@Override
public void newerHongBao(Long uid, BigDecimal money) {
@@ -122,7 +133,22 @@
}
@Override
- public void extractWrong(Long uid, String time) {
+ public void extractWrong(Long uid, Extract extract, String time) {
+ // 鎻愮幇澶辫触鐭俊閫氱煡
+ // try {
+ // UserInfo user = userInfoService.getUserById(uid);
+ // if (extract != null && user != null &&
+ // !StringUtil.isNullOrEmpty(user.getPhone())) {
+ // smsService.sendExtractFailMsg(user.getPhone(), extract.getMoney());
+ // }
+ // } catch (Exception e) {
+ // try {
+ // LogHelper.errorDetailInfo(e);
+ // } catch (Exception e1) {
+ // e1.printStackTrace();
+ // }
+ // }
+
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractWrongTitle(),
Constant.znxConfig.getExtractWrongMsg().replace("[鏃堕棿]", time));
@@ -132,7 +158,23 @@
}
@Override
- public void extractSuccess(Long uid, String time) {
+ public void extractSuccess(Long uid, Extract extract, String time) {
+ // 鎻愮幇鎴愬姛鐭俊閫氱煡
+ // try {
+ // UserInfo user = userInfoService.getUserById(uid);
+ // if (extract != null && user != null &&
+ // !StringUtil.isNullOrEmpty(user.getPhone())) {
+ // smsService.sendExtractSuccessMsg(user.getPhone(),
+ // extract.getMoney());
+ // }
+ // } catch (Exception e) {
+ // try {
+ // LogHelper.errorDetailInfo(e);
+ // } catch (Exception e1) {
+ // e1.printStackTrace();
+ // }
+ // }
+
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractSuccessTitle(),
Constant.znxConfig.getExtractSuccessMsg().replace("[鏃堕棿]", time));
--
Gitblit v1.8.0