config

yujian

2019-07-30 ed390c70bfbafb399fe20e8b89efc02ca5be008d

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

@@ -28,6 +28,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;

import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;

@@ -49,6 +50,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.order.OrderUserStatisticService;

import com.yeshi.fanli.service.inter.push.PushService;

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

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

@@ -131,6 +133,9 @@


   @Resource

   private UserMoneyService userMoneyService;



   @Resource

   private OrderUserStatisticService orderUserStatisticService;



   @Transactional

   public Integer addExtract(Extract extract) {

@@ -271,9 +276,17 @@
      ExtractAuditRecord auditRecord = new ExtractAuditRecord();

      auditRecord.setBeforeMoney(user.getMyHongBao());

      auditRecord.setExtract(extract);

      extractAuditRecordMapper.insertSelective(auditRecord);



	
      Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);

      // 统计数据

      int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);



      BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),

            minTime);

      int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);

      auditRecord.setExtraInfoStr(new Gson()

            .toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0)));

      extractAuditRecordMapper.insertSelective(auditRecord);



      // 新版资金详情

      UserMoneyDetail userMoneyDetail = null;

@@ -376,6 +389,7 @@
    */

   @Transactional

   private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {

      LogHelper.userErrorInfo("提现:开始通过提现-"+extract.getId());

      String privateKey = Constant.alipayConfig.getPrivateKey();

      AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",

            Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");

@@ -394,15 +408,17 @@
      AlipayFundTransToaccountTransferResponse response = null;

      try {

         response = alipayClient.execute(request);

         LogHelper.userErrorInfo("提现:支付宝通过提现成功-"+extract.getId());

      } catch (AlipayApiException e) {

         e.printStackTrace();

         LogHelper.userErrorInfo("支付宝提现异常：" + response + ",提现信息" + GsonUtil.toJson(extract));

         LogHelper.userErrorInfo("提现:支付宝提现异常：" + response + ",提现信息" + GsonUtil.toJson(extract));

      }



      try {

         CMQManager.getInstance().addExtractResultMsg(extract, response, adminUser);

         LogHelper.userErrorInfo("提现:添加处理队列成功-"+extract.getId());

      } catch (Exception e) {

         LogHelper.userErrorInfo("支付宝提现CMQ异常：" + new Gson().toJson(response) + ",提现信息" + GsonUtil.toJson(extract));

         LogHelper.userErrorInfo("提现:支付宝提现CMQ异常：" + new Gson().toJson(response) + ",提现信息" + GsonUtil.toJson(extract));

      }

   }



@@ -721,7 +737,7 @@
   }



   @Override

   public double countTodayMoney(Long uid) {

      return extractMapper.countTodayMoney(uid);

   public BigDecimal sumTodayApplyMoney(Long uid,String day) {

      return extractMapper.sumToadyApplyByUid(uid,day);

   }

}