Merge remote-tracking branch 'origin/master'

admin

2019-04-04 3a6e476b2f498e876ff10f1328455f58e63ee85a

 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);



}