Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

 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);