维权返利初步修改，拼多多初步增加

admin

2019-04-26 8e30aa7c1f0384f09278699318b4902b815b42a7

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

@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.bus.user.ExtractRecord;

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

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

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

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

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

@@ -50,6 +51,7 @@
import com.yeshi.fanli.service.inter.push.PushService;

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

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

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

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

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

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

@@ -118,6 +120,9 @@


   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;



   @Transactional

   public Integer addExtract(Extract extract) {

@@ -228,6 +233,13 @@
    */

   @Transactional

   private Integer extract(Extract extract) {

      UserAccountBindingHistory history = userAccountBindingHistoryService

            .getLatestHistory(extract.getUserInfo().getId(), UserAccountBindingHistory.TYPE_PHONE);

      // 手机号更换绑定的7天内不能提现

      if (history != null && !history.getFirst()

            && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L)

         return 111;



      final String autoExtract = configService.get("extract_way"); // 是否自动转账

      final String maxCount = configService.get("extract_count_day");

      final String maxMoney = configService.get("extract_money_day");

@@ -354,15 +366,15 @@
            Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");

      AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();

      String uuid = UUID.randomUUID().toString().replace("-", "");

      String appName = systemConfigService.get("appName", extract.getSystem());

      String appName = Constant.systemCommonConfig.getProjectChineseName();

      JSONObject json = new JSONObject();

      json.put("out_biz_no", uuid);

      json.put("payee_type", "ALIPAY_LOGONID");

      json.put("payee_account", extract.getAccount());

      json.put("amount", extract.getMoney());

      json.put("payer_show_name", appName + "提现");

      json.put("payer_show_name", appName + "App" + "提现");

      json.put("payee_real_name", extract.getName());

      json.put("remark", "来自" + appName + "的提现");

      json.put("remark", "来自" + appName + "App" + "的提现");

      request.setBizContent(json.toString());

      AlipayFundTransToaccountTransferResponse response = null;

      try {