From 03552ae04973a224b5ccfce34e64999ea6a13d44 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:31:53 +0800
Subject: [PATCH] 超省2.0
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 4a08e12..dde8c4a 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -26,6 +26,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -246,9 +248,10 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
@ApiImplicitParam(value = "原因", name = "cause", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "phone", name = "phone", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper transferOrder(Long orderId, String cause){
+ public ResponseWarpper transferOrder(Long orderId, String cause,String phone){
if(ToolUtil.isEmpty(orderId)){
return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
}
@@ -260,7 +263,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = orderService.transferOrder(uid, orderId, cause);
+ ResultUtil resultUtil = orderService.transferOrder(uid, orderId, cause,phone);
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -382,10 +385,11 @@
@ApiOperation(value = "服务完成后修改订单状态", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
- @ApiImplicitParam(value = "107（线上支付），108（完成线下支付）", name = "state", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "支付方式（1=线上，2=线下）", name = "payType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "107（待支付），108（已完成）", name = "state", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper setOrderStatus(Long orderId, Integer state){
+ public ResponseWarpper setOrderStatus(Long orderId, Integer payType, Integer state){
if(ToolUtil.isEmpty(orderId)){
return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
}
@@ -397,7 +401,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = orderService.setOrderStatus(uid, orderId, state);
+ ResultUtil resultUtil = orderService.setOrderStatus(uid, orderId, payType, state);
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -447,8 +451,9 @@
@PostMapping("/base/order/cloudRecordingCallback")
public void cloudRecordingCallback(HttpServletRequest request, HttpServletResponse response){
CloudRecordingCallback cloudRecordingCallback = RongYunUtil.cloudRecordingCallback(request);
-// System.err.println("-------------------云端录制状态回调！-------------------");
-// System.err.println(JSON.toJSONString(cloudRecordingCallback));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ System.err.println(sdf.format(new Date()) + "-------------------云端录制状态回调！-------------------");
+ System.err.println(JSON.toJSONString(cloudRecordingCallback));
if(null == cloudRecordingCallback){
System.err.println("云端录制状态回调解析出错！");
return;
--
Gitblit v1.7.1