Merge remote-tracking branch 'origin/master'

xuhy

2023-05-26 5430ccbd452a660bb55ba58d7d5e13ac8c6e7170

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java

@@ -153,7 +153,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil setOrderStatus(Integer uid, Long orderId, Integer state) throws Exception;
    ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception;


    /**
@@ -197,4 +197,10 @@
     * @throws Exception
     */
    List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception;


    /**
     * 主动完成线下收款
     */
    void completeCollection();
}