Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

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

@@ -253,4 +253,20 @@
    */

   public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);



   /**

    * 删除错误订单

    * 
    * @param coId

    */

   public void deleteErrorCommonOrder(Long coId);



   /**

    * 根据订单类型与交易ID查询

    * 
    * @param sourceType

    * @param tradeId

    * @return

    */

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



}