Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -84,6 +84,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

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

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

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

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

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

@@ -108,6 +109,7 @@
import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.email.MailSenderUtil;

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

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

@@ -208,6 +210,9 @@
   

   @Resource

   private MaskKeyService maskKeyService;

	
   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -577,7 +582,9 @@
      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }



      if (mySettings.getOpenSpreadHongBao() == null) {

         mySettings.setOpenSpreadHongBao(0);

      }

      data.put("moduleState", mySettings);



      int welfareCenterNews = 0;

@@ -746,7 +753,8 @@
      data.put("error", "0");

      data.put("maxError", 1);

      String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现的最小金额

      String maxMoney = configService.get("extract_money_day"); // 每日最大提现金额

      String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最小金额

      String maxDayMoney = configService.get("extract_money_day"); // 每日最大提现金额

      int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));

      ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);

      boolean canExtract = true;

@@ -755,15 +763,15 @@
         canExtract = false;

         errorMsg = String.format("每日最多提现%s次", maxDayCount + "");

      } else if (extractRecord != null

            && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxMoney)) > 0) {

            && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxDayMoney)) > 0) {

         canExtract = false;

         errorMsg = String.format("每日最多提现%s元", maxMoney);

         errorMsg = String.format("每日最多提现%s元", maxDayMoney);

      }

      data.put("canExtract", canExtract);

      data.put("extractErrorMsg", errorMsg);



      data.put("minMoney", minMoney);

      data.put("maxMoney", maxMoney);

      data.put("minMoney", minMoney);//单笔最低

      data.put("maxMoney", maxMoney);//单笔最高

      data.put("maxDayCount", maxDayCount);

      data.put("bindingAccountList", gson.toJson(filterBindingAccount(bindingAccountList)));



@@ -1070,6 +1078,7 @@
    * @param type

    * @param out

    */

   @RequestSerializableByKey(key="uid")

   @RequestMapping(value = "extractmoneynew", method = RequestMethod.POST)

   public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,

         HttpServletRequest request, int type, PrintWriter out) {

@@ -2085,7 +2094,18 @@
         if (mySettings.getNoInvitationBonus() == null) {

            mySettings.setNoInvitationBonus(0);

         }

			
         if (mySettings.getOpenSpreadHongBao() == null) {

            if(userTaoLiJinDetailService.countDetail(uid) > 0) {

               mySettings.setOpenSpreadHongBao(1);

            } else {

               mySettings.setOpenSpreadHongBao(0);

            }

         }

         data.put("moduleState", mySettings);

			
			
			


         int welfareCenterNews = 0;

         String invitCode = null;