Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -223,7 +223,21 @@
      

   }

   

   @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); // 根据

   }

	
   

}