From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 5516bc0..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,7 +390,8 @@
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;
}
@@ -403,9 +404,9 @@
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#");
+ desc.append("缁存潈璁㈠崟浣ｉ噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
if (record.getExtraInfo().getOrderCount50More() > 0
- || record.getExtraInfo().getWeiQuanOrderCount() >1
+ || record.getExtraInfo().getWeiQuanOrderCount() > 1
|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)
warnLevel = 2;
} else {
@@ -429,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