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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

@@ -45,4 +45,16 @@
    * @throws BanLiShopOrderException

    */

   public void charge(Long orderId) throws BanLiShopOrderException;

	
	
   /**

    * 验证订单失效状态

    * @Title: invalidOrderByOrderId

    * @Description: 
    * @param orderId

    * @param stateDesc 
    * void 返回类型

    * @throws

    */

   public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException;

}