Merge remote-tracking branch 'origin/div' into div

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderPayService.java

@@ -37,4 +37,12 @@
    * @throws BanLiShopOrderException

    */

   public void refund(Long orderId) throws BanLiShopOrderException;



   /**

    * 充值（按照订单号）

    * 
    * @param orderId

    * @throws BanLiShopOrderException

    */

   public void charge(Long orderId) throws BanLiShopOrderException;

}