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

puzhibing

2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4

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

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


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


    ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
}