Merge remote-tracking branch 'origin/master'

admin

2019-01-10 02d8f36a2a51a2ffcacdb619bee34077da61b328

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java

@@ -68,4 +68,16 @@
   List<TaoBaoOrder> getStateByOrderIdAndPayment(@Param("orderId")String orderId, @Param("payment")String payment);
   
   
   TaoBaoOrder selectLatestByAuctionId(long auctionId);
	
	
   /**
    *  统计所有订单
    * @param channel
    * @return
    */
   List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
         @Param("startTime")String startTime, @Param("endTime")String endTime);
	
	
}