双12活动添加,邀请码发布修改，爬单新规则添加

admin

2019-12-06 cd637932a970e7935b17d41568fe89c92775bccc

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java

@@ -4,6 +4,7 @@
import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.math.RoundingMode;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

@@ -13,7 +14,6 @@


import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.BigDecimalUtil;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

@@ -26,13 +26,20 @@
import com.google.gson.stream.JsonReader;

import com.google.gson.stream.JsonWriter;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

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;



@@ -57,6 +64,15 @@
   @Resource

   private HongBaoV2Service hongBaoV2Service;



   @Resource

   private ExtractService extractService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private ConfigService configService;



   /**

    * 新版资金详情（1.4.9）

    * 

@@ -68,11 +84,14 @@
    *            年份

    * @param month

    *            月份

    * @param type

    *            1-收入 2-支出 0-全部

    * 
    * @param out

    */

   @RequestMapping(value = "getUserMoneyDetailList")

   public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month,

         PrintWriter out) {

         Integer type, PrintWriter out) {

      if (uid == null || uid == 0) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

@@ -93,8 +112,9 @@
         date = new Date(ca.getTimeInMillis() - 1);

      }



      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);

      long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);

      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, type,

            date);

      long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, type, date);

      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {

         @Override

@@ -152,8 +172,9 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

      UserInfo user = userInfoService.getUserById(uid);



      BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao();

      BigDecimal balance = user.getMyHongBao();



      UserMoneyStatisticVO vo = new UserMoneyStatisticVO();

      vo.setBalanceMoney(balance);

@@ -265,13 +286,15 @@
      Calendar ca = Calendar.getInstance();

      ca.setTime(new Date(timeStamp));

      ca.add(Calendar.MONTH, 1);

      maxDate = new Date(ca.getTimeInMillis());

      maxDate = new Date(

            TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM"));



      // 本月未到账

      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));



      // 全部未到账

      minDate = new Date(0);

      maxDate = new Date(timeStamp);

      vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));

      GsonBuilder builder = new GsonBuilder();

      builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

@@ -287,7 +310,105 @@
         }

      });



      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, RoundingMode.HALF_UP));

         // 获取是否绑定了微信

         if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {

            vo.setBindingWX(true);

         } else

            vo.setBindingWX(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();

            }

         }



         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)));

   }



   /**

    * 自动提现

    * 
    * @param acceptData

    * @param type

    * @param out

    */

   @RequestMapping("autoExtract")

   public void autoExtract(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {

      if (type == null) {

         out.print(JsonUtil.loadFalseResult("请上传type"));

         return;

      }

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用戶未登录"));

         return;

      }



      UserInfoExtra userExtra = userInfoExtraService.getUserInfoExtra(uid);

      UserInfo user = userInfoService.selectByPKey(uid);

      if (user == null) {

         out.print(JsonUtil.loadFalseResult("用戶不存在"));

         return;

      }

      if (type == 1)// 开启

      {

         if (userExtra.getAutoExtract() == null || userExtra.getAutoExtract() == false) {

            if (StringUtil.isNullOrEmpty(user.getWxUnionId()))// 尚未綁定微信

            {

               out.print(JsonUtil.loadFalseResult("未綁定微信"));

               return;

            }

            // 设置自动提现

            UserInfoExtra update = new UserInfoExtra();

            update.setId(userExtra.getId());

            update.setAutoExtract(true);

            try {

               userInfoExtraService.saveUserInfoExtra(update);

            } catch (UserInfoExtraException e) {

               e.printStackTrace();

            }

            out.print(JsonUtil.loadTrueResult(""));

            return;

         } else {

            out.print(JsonUtil.loadTrueResult(""));

            return;

         }

      } else {// 关闭

         UserInfoExtra update = new UserInfoExtra();

         update.setId(userExtra.getId());

         update.setAutoExtract(false);

         update.setCloseTimeExtract(new Date());

         try {

            userInfoExtraService.saveUserInfoExtra(update);

         } catch (UserInfoExtraException e) {

            e.printStackTrace();

         }

         out.print(JsonUtil.loadTrueResult(""));

         return;

      }



   }



}