From cbf87e9ddb66d167359cdab59890575efc2edae4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 九月 2019 17:00:10 +0800
Subject: [PATCH] 删除IOS升级板栗快省的banner
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 9847e79..ba558da 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
@@ -390,25 +390,35 @@
if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {
UserInfo userInfo = extract.getUserInfo();
if (userInfo != null) {
- BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId());
+ BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),
+ TimeUtil.getGernalTime(extract.getExtractTime()));
if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {
warnLevel = 1;
}
}
}
-
}
if (record.getExtraInfo() != null) {
- if (record.getExtraInfo().getOrderCount50More() > 0
- || record.getExtraInfo().getWeiQuanOrderCount() > 0
- || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0)
- warnLevel = 2;
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());
+ 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);
@@ -420,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();
--
Gitblit v1.8.0