From f59827148e50dc0289a58a97762121dcffbfc849 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:00:31 +0800
Subject: [PATCH] 删除HongBaoService与相关依赖

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java |   12 +++---------
 1 files changed, 3 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 89f1a50..760a5aa 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
@@ -39,8 +39,6 @@
 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.hongbao.HongBaoService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
 import com.yeshi.fanli.service.inter.push.PushRecordService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
@@ -85,17 +83,12 @@
 	private ExtractAuditRecordService extractAuditRecordService;
 
 	@Resource
-	private HongBaoService hongBaoService;
-
-	@Resource
 	private HongBaoV2CountService hongBaoV2CountService;
 
 	@Resource
 	private AdminUserService adminUserService;
 
-	@Resource
-	private OrderItemServcie orderItemServcie;
-	
+
 	@Resource
 	private RedisManager redisManager;
 
@@ -104,6 +97,7 @@
 
 	@Resource
 	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+	
 
 	private final static String TODAY = "1";
 	private final static String THREE = "2";
@@ -445,7 +439,7 @@
 						UserInfo userInfo = extract.getUserInfo();
 						Long id = userInfo.getId();
 						countByUid = hongBaoService.getCountByUid(id);
-						countCancel = hongBaoService.getCountCancelByUid(id);
+						countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO); 
 					}
 					extractAuditRecord.setCancelOrderNum((long) countCancel);
 					extractAuditRecord.setOrderNum((long) countByUid);

--
Gitblit v1.8.0