Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

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

@@ -213,11 +213,21 @@

   /**
    * 根据来源和交易ID获取订单详情
    * 
    * @param sourceType
    * @param tradeId
    * @return
    */
	

   CommonOrder selectBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);

   /**
    * 根据来源和交易ID获取订单列表
    * 
    * @param sourceType
    * @param tradeId
    * @return
    */
   List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);

}