Merge remote-tracking branch 'origin/master'

yujian

2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3

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

@@ -36,4 +36,14 @@
    * @return

    */

   public long countFanLiOrder(Long uid);



   /**

    * 根据订单号和订单来源获取数量

    * 
    * @param orderNo

    * @param type

    * @return

    */

   public long countByOrderNoAndHongBaoType(String orderNo, int type);



}