Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 9b426ebdbe9d283cd6f01719db9a00f2533df286

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java

@@ -230,4 +230,15 @@
     * @throws Exception
     */
    Map<String, Object> queryMoneyInfo(Integer orderId, Integer orderType) throws Exception;


    /**
     * 司机支付订单
     * @param uid
     * @param orderId
     * @param orderType
     * @return
     * @throws Exception
     */
    ResultUtil payOrder(Integer uid, Integer orderId, Integer orderType, Integer payType, Integer language) throws Exception;
}