Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -14,11 +14,9 @@
import org.yeshi.utils.DateUtil;



import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;

import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;

import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

@@ -34,13 +32,7 @@
   private HongBaoV2CountMapper hongBaoV2CountMapper;



   @Resource

   private HongBaoMapper hongBaoMapper;



   @Resource

   private TaoBaoOrderMapper taoBaoOrderMapper;



   @Resource

   private OrderItemMapper orderItemMapper;



   @Resource

   private CommonOrderMapper commonOrderMapper;

@@ -298,5 +290,10 @@
      long count = hongBaoV2CountMapper.countNumberByUid(uid);

      return (int) count;

   }

	
   @Override

   public BigDecimal countRebateCouponMoney() {

      return hongBaoV2CountMapper.countRebateCouponMoney();

   }



}