Merge remote-tracking branch 'origin/master'

admin

2019-07-22 a8c566a3b274058fe31feaf8e980b2334b9bf83a

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -5,6 +5,8 @@
import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.entity.jd.JDOrder;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.pdd.PDDOrder;

@@ -288,4 +290,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);



}