Merge remote-tracking branch 'origin/div' into div

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

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

@@ -66,4 +66,26 @@
   List<TaoBaoWeiQuanOrder> listByState(@Param("state") String state, @Param("start") long start,
         @Param("count") int count);

   /**
    * 根据状态统计数量
    * 
    * @param state
    * @return
    */
   long countByState(@Param("state") String state);
	
	
   /**
    * 根据订单号检索
    * @param orderId
    * @return
    */
   List<TaoBaoWeiQuanOrder> listByOrderId(String orderId);
	
   /**
    * 根据子订单号检索
    * @param tradeId
    * @return
    */
   TaoBaoWeiQuanOrder selectByOrderItem(String tradeId);
}