Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.count;



import java.math.BigDecimal;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.HashMap;

@@ -147,12 +148,14 @@
      

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

      

      // 用户订单

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

            startTime, endTime);

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

         return result_list;

      } 

      

      // 淘宝联盟

      List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, 

            startTime, endTime);

      

@@ -218,10 +221,28 @@
   public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,

         String endTime) throws Exception{

      return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);

		
   }

	
   @Override

   public Map<String, Object> countOrderNumberBySettleTime(Long uid, Integer state, Integer day) {

      return commonOrderCountMapper.countOrderNumberBySettleTime(uid, state, day);

   }

   

   

   /**

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

    * @param uid

    * @return

    */

   @Override

   public Map<String, Object> lastMonthSettleOrderNumber(Long uid) {

      return countOrderNumberBySettleTime(uid, 2, 4); // 根据

   }

	
   @Override

   public BigDecimal getMoneyByOrderNo(String orderNo) {

      return commonOrderCountMapper.getMoneyByOrderNo(orderNo);

   }

   

   

}