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/service/inter/order/CommonOrderService.java

@@ -269,4 +269,18 @@
    */

   public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId);



   /**

    * 根据条件查询订单

    * 
    * @param sourceType

    * @param state

    * @param minTime

    * @param maxTime

    * @param page

    * @param pageSize

    * @return

    */

   List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,

         Long maxTime, int page, int pageSize);



}