From df03194e4b0c0737cf84127c4dd69d456e30ed24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:24:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 760a5aa..d428f08 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
@@ -88,7 +88,6 @@
@Resource
private AdminUserService adminUserService;
-
@Resource
private RedisManager redisManager;
@@ -97,7 +96,6 @@
@Resource
private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
-
private final static String TODAY = "1";
private final static String THREE = "2";
@@ -438,8 +436,8 @@
if (extract != null) {
UserInfo userInfo = extract.getUserInfo();
Long id = userInfo.getId();
- countByUid = hongBaoService.getCountByUid(id);
- countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
+ countByUid = hongBaoV2CountService.countNumberByUid(id);
+ countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
}
extractAuditRecord.setCancelOrderNum((long) countCancel);
extractAuditRecord.setOrderNum((long) countByUid);
--
Gitblit v1.8.0