From ee582a5d091966cf2324653c53a7553623e09730 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 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 d25c44e..fa2417c 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
@@ -16,7 +16,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
@@ -36,15 +35,14 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.count.ExtractCountService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractService;
+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.taobao.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.user.AccountMessageService;
-import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService;
-import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -71,9 +69,6 @@
private ExtractCountService extractCountService;
@Resource
- private AccountMessageService accountMessageService;
-
- @Resource
private PushRecordService pushRecordService;
@Resource
@@ -96,7 +91,6 @@
@Resource
private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
-
/**
*
@@ -131,17 +125,19 @@
// 鏃ュ織璁板綍
if (integer == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
+ LogHelper
+ .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
} else if (integer == 1) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
+ LogHelper.userInfo(
+ "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
} else {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
+ LogHelper.userInfo(
+ "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
}
}
-
/**
*
@@ -170,7 +166,6 @@
return;
}
-
try {
// 缂栫爜杞崲
reason = URLDecoder.decode(reason, "UTF-8");
@@ -179,7 +174,7 @@
}
try {
-
+
extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
@@ -201,7 +196,6 @@
}
}
-
/**
* 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
@@ -393,16 +387,39 @@
Extract extract = record.getExtract();
if (extract != null) {
Integer extractState = extract.getState();
- if (extractState != null && extractState == 0) {
+ if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {
UserInfo userInfo = extract.getUserInfo();
if (userInfo != null) {
- double countTodayMoney = extractService.countTodayMoney(userInfo.getId());
- if (countTodayMoney >= 100) {
+ BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),
+ TimeUtil.getGernalTime(extract.getExtractTime()));
+ if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {
warnLevel = 1;
}
}
}
+ }
+ if (record.getExtraInfo() != null) {
+ StringBuffer desc = new StringBuffer();
+ if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) {
+ desc.append("澶х瑪璁㈠崟鏁�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+ desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+ desc.append("缁存潈璁㈠崟浣ｉ噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+ if (record.getExtraInfo().getOrderCount50More() > 0
+ || record.getExtraInfo().getWeiQuanOrderCount() > 1
+ || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)
+ warnLevel = 2;
+ } else {
+ if (record.getExtraInfo().getOrderCount50More() > 0
+ || record.getExtraInfo().getWeiQuanOrderCount() > 0
+ || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0)
+ warnLevel = 2;
+ desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+ desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+ desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+ desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
+ }
+ record.setExtraInfoStr(desc.toString());
}
record.setWarnLevel(warnLevel);
}
@@ -413,6 +430,8 @@
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls();
+ gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
@@ -637,6 +656,18 @@
return;
}
+ for (ExtractAuditRecord record : list) {
+
+ if (record.getExtraInfo() != null) {
+ StringBuffer desc = new StringBuffer();
+ desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+ desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+ desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+ desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
+ record.setExtraInfoStr(desc.toString());
+ }
+ }
+
int count = extractAuditRecordService.getByUidCount(uid);
int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -716,7 +747,7 @@
}
try {
- extractService.checkExtract(uid);
+ extractService.checkExtract(Long.parseLong(uid));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝ｅ父"));
} catch (ExtractException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0