From 51f1f94856c9401543f89660f7e178d50a2632be Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 17 十月 2019 14:43:57 +0800
Subject: [PATCH] 用户加入标识 + 金币加入搜索功能
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index 3bc09fb..9439c01 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/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);
--
Gitblit v1.8.0