|
@@ -74,13 +74,13 @@ public class volunteerOrderController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "志愿者滑动,开始订单", notes = "目传secondOrderId,以及当前地址和收货地址的距离")
|
|
|
@PostMapping("/volunteerStartSecondOrder")
|
|
|
- public AjaxResult volunteerStartWork(SecondOrder secondOrder){
|
|
|
+ public R<String> volunteerStartWork(SecondOrder secondOrder){
|
|
|
UpdateWrapper<SecondOrder> updateWrapper = new UpdateWrapper<>();
|
|
|
SecondOrder secondOrder1 = secondOrderService.getById(secondOrder.getSecondOrderId());
|
|
|
//计算距离:
|
|
|
double v;
|
|
|
if (secondOrder.getServiceStartLongitude().isEmpty() && secondOrder.getServiceStartLatitude().isEmpty()){
|
|
|
- throw new RuntimeException("获取您当前位置失败,请保持网络通畅并且打开位置权限后重新开始订单");
|
|
|
+ return R.fail("获取您当前位置失败,请保持网络通畅并且打开位置权限后重新开始订单");
|
|
|
}else {
|
|
|
double v1 = Double.parseDouble(secondOrder.getServiceStartLatitude());
|
|
|
v = GeoUtils.calculateDistance(
|
|
@@ -99,7 +99,7 @@ public class volunteerOrderController extends BaseController {
|
|
|
.system(1).userId(secondOrder1.getUserId())
|
|
|
.msgContent("您预约"+secondOrder1.getWorkDate()+" "+secondOrder1.getWorkStartTime()+"的订单已开始服务")
|
|
|
.build());
|
|
|
- return AjaxResult.success();
|
|
|
+ return R.ok();
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "志愿者滑动,结束订单并上传图片", notes = "传入seconderOrderId,以及图片拼接在一起的字符串 普通参数")
|