admin
2019-09-18 b19d2e730b0ea707b500b307f58c46ba0cef695f
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -30,13 +30,14 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
import com.yeshi.fanli.vo.money.UserMoneyStatisticVO;
@@ -303,23 +304,41 @@
         }
      });
      // 获取提现中的信息
      BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
      if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
         vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));
      // 获取是否绑定了微信
      if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
         vo.setBindingWX(true);
      } else
         vo.setBindingWX(false);
      if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
         // 获取提现中的信息
         BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
         if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));
         // 获取是否绑定了微信
         if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
            vo.setBindingWX(true);
         } else
            vo.setBindingWX(false);
      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
      if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
         vo.setAutoExtract(true);
      else
         vo.setAutoExtract(false);
         UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
         // 如果绑定了微信而且未开通自动提现就先开通自动提现
         if (extra.getAutoExtract() == null && !StringUtil.isNullOrEmpty(user.getWxUnionId())) {
            UserInfoExtra update = new UserInfoExtra();
            update.setId(extra.getId());
            update.setAutoExtract(true);
            try {
               userInfoExtraService.saveUserInfoExtra(update);// 设置自动提现开启
               extra.setAutoExtract(true);
            } catch (UserInfoExtraException e) {
               e.printStackTrace();
            }
         }
      vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
         if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
            vo.setAutoExtract(true);
         else
            vo.setAutoExtract(false);
         vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
         vo.setOpenAutoExtractMsg("自动提现必须要微信授权,当账户中的余额≥2元时,系统在保障你资金安全的情况下,以微信红包的形式完成提现");
         vo.setCloseAutoExtractMsg("关闭自动提现后,60天以内将不自动提现,60天后系统将会自动开启,敬请知晓");
      }
      out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
   }