fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -2,7 +2,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -36,7 +35,6 @@ import com.yeshi.fanli.dao.user.ExtractRecordDao; import com.yeshi.fanli.dao.user.MoneyRecordDao; import com.yeshi.fanli.entity.bus.user.AccountDetails; import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory; import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo; import com.yeshi.fanli.entity.bus.user.Extract; import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord; @@ -45,8 +43,6 @@ import com.yeshi.fanli.entity.bus.user.PayInfo; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.common.AdminUser; import com.yeshi.fanli.exception.AlipayAccountException; import com.yeshi.fanli.exception.AlipayTransferException; import com.yeshi.fanli.exception.NotExistObjectException; import com.yeshi.fanli.exception.ObjectStateException; import com.yeshi.fanli.log.LogHelper; @@ -60,12 +56,10 @@ import com.yeshi.fanli.service.inter.user.MoneyRecordService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserNotificationService; import com.yeshi.fanli.util.BeanUtil; import com.yeshi.fanli.util.CMQManager; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.factory.AccountDetailsFactory; @@ -249,7 +243,7 @@ find, find.getUserInfo()); accountDetailsMapper.insertSelective(ad); try { userNotificationService.extractWrong(user.getId(), userNotificationService.extractWrong(user.getId(), find, TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm")); } catch (Exception e) { e.printStackTrace(); @@ -488,7 +482,7 @@ extractMapper.updateByPrimaryKeySelective(updateExtract); try { userNotificationService.extractSuccess(extract.getUserInfo().getId(), userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract, TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm")); LogHelper.userInfo("支付宝转账成功:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名：" 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)); fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java
@@ -2,6 +2,8 @@ import java.math.BigDecimal; import com.yeshi.fanli.entity.bus.user.Extract; /** * 用户通知服务 * @@ -91,7 +93,7 @@ * @param uid * @param time */ public void extractWrong(Long uid, String time); public void extractWrong(Long uid, Extract extract, String time); /** * 提现成功 @@ -99,7 +101,7 @@ * @param uid * @param time */ public void extractSuccess(Long uid, String time); public void extractSuccess(Long uid, Extract extract, String time); /** * 支付宝账号验证成功 @@ -107,6 +109,6 @@ * @param uid * @param money */ public void alipayAccountValidRight(Long uid, BigDecimal money,String account); public void alipayAccountValidRight(Long uid, BigDecimal money, String account); }
