From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 86 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 32 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index db54af7..a459b45 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityInfoWrapper;
import com.stylefeng.guns.modular.crossCity.warpper.OrderWarpper;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
@@ -60,6 +59,10 @@
@Resource
private DriverWorkMapper driverWorkMapper;
+ @Autowired
+ private ISysTimeoutMoneyService sysTimeoutMoneyService;
+ @Autowired
+ private IOpenCityService openCityService;
@Autowired
private ICarService carService;
@@ -278,8 +281,7 @@
}
- @Autowired
- private ISysTimeoutMoneyService sysTimeoutMoneyService;
+
/**
* 获取服务中页面订单详情
@@ -304,8 +306,8 @@
Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, orderType);
if (orderType == 4 || orderType == 5){
-
- SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
+ OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
+ SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");
@@ -324,12 +326,14 @@
}
}
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
- //return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryOrderInfo1")
@@ -348,8 +352,8 @@
Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, 7);
if (orderType == 4 || orderType == 5){
-
- SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
+ OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
+ SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");
@@ -436,7 +440,7 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额,4=云闪付）", name = "payType", required = false, dataType = "int"),
- @ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -454,6 +458,33 @@
return ResultUtil.runErr();
}
}
+
+ @ResponseBody
+ @PostMapping("/api/order/reassignCancel")
+ @ApiOperation(value = "提交改派申请--取消", tags = {"司机端-服务中"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额,4=云闪付）", name = "payType", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil reassignCancel(Reassign reassign, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return reassignService.saveDataCancel(reassign, uid, null);
+ }catch (SystemException s){
+ return ResultUtil.error(s.getMsg());
+ } catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
/**
@@ -553,6 +584,10 @@
return ResultUtil.runErr();
}
}
+
+
+
+
@ResponseBody
@PostMapping("/api/order/cancleOrder")
@@ -570,6 +605,9 @@
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/updatePeopleNum")
@ApiOperation(value = "修改人数", tags = {"司机端-服务中"}, notes = "")
@@ -587,6 +625,8 @@
return ResultUtil.runErr();
}
}
+
+
@ResponseBody
@PostMapping("/api/order/confirmFees1")
@@ -722,30 +762,7 @@
}
- @ResponseBody
- @PostMapping("/base/order/test")
- public String test(String phoneA, String phoneB){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, (System.currentTimeMillis() + 86400000));
- System.err.println(JSON.toJSONString(map));
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
- @ResponseBody
- @PostMapping("/base/order/test_")
- public String test(String bindId){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId, null, null);
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
/**
@@ -778,6 +795,9 @@
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryVoiceBroadcast")
@ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "")
@@ -824,6 +844,8 @@
}
}
+
+
@ResponseBody
--
Gitblit v1.7.1