Merge remote-tracking branch 'origin/div' into div

admin

2019-10-17 143160118ab3937ae9e340f61aafa764756856c8

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -37,6 +37,7 @@
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;

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

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

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

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

import com.yeshi.fanli.exception.ExtractException;

import com.yeshi.fanli.exception.NotExistObjectException;

@@ -52,6 +53,7 @@
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -100,6 +102,10 @@


   @Resource

   private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

	


   /**

    * 

@@ -554,7 +560,14 @@
            } else {

               surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);

            }

				
            String mark = "";

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());

            if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {

               mark = "警惕！！ " + userInfoExtra.getMark();

            }



            data.put("mark",mark);

            data.put("extract", extract);

            data.put("beforeMoney", beforeMoney);

            data.put("surplusTime", surplusTime);

@@ -618,6 +631,13 @@
                  surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);

               }



               String mark = "";

               UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());

               if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {

                  mark = "警惕！！ " + userInfoExtra.getMark();

               }



               data.put("mark",mark);

               data.put("extract", extract);

               data.put("beforeMoney", beforeMoney);

               data.put("surplusTime", surplusTime);