Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

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

@@ -187,4 +187,26 @@
    */
   List<CommonOrder> listBySourceTypeAndOrderNo(@Param("sourceType") int sourceType, @Param("orderNo") String orderNo);

	
   /**
    * 查询券奖励金额以及订单信息
    * @param uid
    * @param state
    * @param orderNo
    * @return
    */
   List<CommonOrderVO> getCouponHongbaoByOrderNo(@Param("uid") Long uid, @Param("hongBaoState") Integer hongBaoState, 
         @Param("orderNo") String orderNo);

	
   /**
    * 查询券奖励金额以及订单信息
    * @param uid
    * @param state
    * @param orderNo
    * @return
    */
   CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo, 
         @Param("orderState") Integer orderState);
	
}