华为推送修改，商品更新循环依赖修改

admin

2019-08-08 e2b90ab5fa5c12d945751a08b97e252ce68341fd

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

@@ -12,14 +12,16 @@
import org.springframework.stereotype.Service;

import org.yeshi.utils.DateUtil;



import com.yeshi.fanli.dao.mybatis.jd.JDOrderItemMapper;

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

import com.yeshi.fanli.dao.mybatis.pdd.PDDOrderMapper;

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.util.Constant;



@Service

public class CommonOrderCountServiceImpl implements CommonOrderCountService {





   @Resource

   private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;

@@ -28,15 +30,21 @@
   private TaoBaoOrderMapper taoBaoOrderMapper;

   

   @Resource

   private CommonOrderCountMapper commonOrderCountMapper;

   private JDOrderItemMapper jdOrderItemMapper;

   

   @Resource

   private PDDOrderMapper pddOrderMapper;



   @Resource

   private CommonOrderCountMapper commonOrderCountMapper;

   

   @Override

   public Long countByState(Integer state) {

      return    commonOrderCountMapper.countByState(state);

   }

   

   public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {

   public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list)

         throws Exception {



      List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();



@@ -144,21 +152,30 @@
   

   @Override

   public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,

         String endTime) throws Exception{

         String endTime, int sourceType) throws Exception {

      

      List<Map<String, Object>> result_list = null;

      

      // 用户订单

      List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,

            startTime, endTime);

      List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime,

            endTime, sourceType);

      if (listTotal == null || listTotal.size() == 0) {

         return result_list;

      } 

      

      // 淘宝联盟

      List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, 
            startTime, endTime);

		
      List<Map<String, Object>> type_list = null;

      switch (sourceType) {

      case Constant.SOURCE_TYPE_TAOBAO:

         type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, startTime, endTime);

         break;

      case Constant.SOURCE_TYPE_JD:

         type_list = jdOrderItemMapper.countOrderNumber(dateType, year, startTime, endTime);

         break;

      case Constant.SOURCE_TYPE_PDD:

         type_list = pddOrderMapper.countOrderNumber(dateType, year, startTime, endTime);

         break;

      }

      if (type_list == null || type_list.size() == 0) {

         return null;

      }

@@ -216,7 +233,6 @@
      return taoBaoWeiQuanOrderMapper.countWeiQaunOrderMoney(dateType, year, startTime, endTime);

   }

   

	
   @Override

   public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,

         String endTime) throws Exception{

@@ -228,9 +244,9 @@
      return commonOrderCountMapper.countOrderNumberBySettleTime(uid, state, day);

   }

   

	
   /**

    * 根据结算时间筛选 上个月已结算的订订单数量

    * 
    * @param uid

    * @return

    */

@@ -243,6 +259,5 @@
   public BigDecimal getMoneyByOrderNo(String orderNo) {

      return commonOrderCountMapper.getMoneyByOrderNo(orderNo);

   }

	
   

}