From 7f943e54f259c7ff69c7591dbd6803171126b01e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 21 六月 2019 09:35:08 +0800
Subject: [PATCH] 发起提现增加统计，添加京东订单与商品，拼多多订单与商品
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..5516bc0 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
@@ -396,19 +396,28 @@
}
}
}
-
}
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);
--
Gitblit v1.8.0