Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-17 010efba33ae0e00ff06e5a95004e0f624f073ba7

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -230,4 +230,17 @@
    */
   List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);

   /**
    * 
    * @param sourceType
    * @param state
    * @param minTime
    *            -最大创建时间
    * @param maxTime
    *            -最小创建时间
    * @return
    */
   List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
         @Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
         @Param("start") long start, @Param("count") int count);
}