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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;

}