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

huliguo

6 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java

@@ -37,10 +37,11 @@
     */
    OrderPayment getByOrderId(String orderId);

    OrderPayment getByUnpaidOrderId(String orderId);
    /**
     *
     * @param outTradeNo
     * @param transactionId
     */
    void updatePaySuccess(String outTradeNo, String transactionId);
    void updatePaySuccess(String outTradeNo, BigDecimal feeAmount, String transactionId);
}