From d0c88e9f82a73e225ec04f3f8b533cf1d97028bc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 17 八月 2023 11:49:21 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java index 64a94d7..6b4be09 100644 --- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java +++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java @@ -109,7 +109,7 @@ * @return * @throws Exception */ - ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception; + ResultUtil transferOrder(Integer uid, Long orderId, String cause,String phone) throws Exception; /** @@ -213,6 +213,7 @@ void completeCollection(); + ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType); -- Gitblit v1.7.1