Merge remote-tracking branch 'origin/div' into div

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -58,12 +58,10 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

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.TimeUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;



import net.sf.json.JSONObject;

@@ -109,9 +107,6 @@


   @Resource

   private PushService pushService;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;

@@ -224,13 +219,6 @@
      extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);

      // 新版资金详情



      try {

         userNotificationService.extractWrong(user.getId(), find,

               TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));

      } catch (Exception e) {

         e.printStackTrace();

      }



      // 新版通知

      userMoneyMsgNotificationService.extractFail(find, reason);

   }

@@ -303,7 +291,6 @@
      // 减去账户资金

      userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);



      userNotificationService.extractApply(extract.getUserInfo().getId());

      // 添加新版通知

      userMoneyMsgNotificationService.extractApplay(extract);



@@ -470,10 +457,6 @@
         userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);



         try {



            userNotificationService.extractTransferFail(user.getId(),

                  TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



            LogHelper.userInfo("支付宝转账失败:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

                  + extract.getName() + ",所转金额：" + extract.getMoney() + ",失败原因" + extract.getReason() + "]");



@@ -511,9 +494,6 @@
      extractMapper.updateByPrimaryKeySelective(updateExtract);



      try {

         userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,

               TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



         LogHelper.userInfo("支付宝转账成功:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

               + extract.getName() + ",所转金额：" + extract.getMoney() + "]");

      } catch (Exception e) {

@@ -740,4 +720,16 @@
   public BigDecimal sumTodayApplyMoney(Long uid,String day) {

      return extractMapper.sumToadyApplyByUid(uid,day);

   }



   @Override

   public BigDecimal sumVerifyingMoney(Long uid) {

      List<Integer> stateList=new ArrayList<>();

        stateList.add(Extract.STATE_NOT_PROCESS);

        stateList.add(Extract.STATE_PROCESSING);

      BigDecimal money= extractMapper.sumMoneyByUidAndState(uid, stateList);

      if(money==null)

         return new BigDecimal(0);

      else

         return money;

   }

}