From 49ffecc181ee442546864c0eb78ba9be66cede15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 九月 2023 10:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 6973e29..a989545 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -8,10 +9,7 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
-import com.stylefeng.guns.modular.system.model.City;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.Income;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -80,6 +78,9 @@
@Value("${share.url}")
private String shareUrl;
+
+ @Autowired
+ private TEmailService emailService;
@@ -367,6 +368,25 @@
}
+ @ResponseBody
+ @PostMapping("/api/driver/getEmailList")
+ @ApiOperation(value = "获取邮箱信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<?> getEmailList(HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",2).orderBy("createTime",false)));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
/**
* 司机注册后完善车辆信息
@@ -476,7 +496,6 @@
}
}
-
/**
* 获取忘记密码页面的电话
* @return
@@ -553,7 +572,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 司机上下班操作
@@ -635,7 +653,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/driver/work2")
@ApiOperation(value = "司机上下班操作,同时设置接单类型【1.0】", tags = {"司机端-车载端"}, notes = "")
@@ -656,7 +673,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/driver/queryHomeNum")
@ApiOperation(value = "获取首页统计数据", tags = {"司机端-车载端"}, notes = "")
@@ -676,8 +692,6 @@
return ResultUtil.runErr();
}
}
-
-
/**
* 上班时选择的业务类型
@@ -713,7 +727,6 @@
}
}
-
/**
* 存储订单服务中的司机位置
* @param orderPosition
@@ -731,8 +744,6 @@
}
}
-
-
@ResponseBody
@PostMapping("/base/driver/queryInfo_")
@ApiOperation(value = "根据用户id获取数据", tags = {"司机端-注册"}, notes = "")
@@ -748,9 +759,6 @@
return ResultUtil.runErr();
}
}
-
-
-
/**
* 获取个人中心详情
@@ -781,7 +789,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 修改手机号码
@@ -854,8 +861,6 @@
}
}
-
-
/**
* 修改密码
* @param password
@@ -882,7 +887,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 获取设置接单的业务类型列表
@@ -918,10 +922,6 @@
}
}
-
-
-
-
/**
* 设置接单规则
* @param type
@@ -948,7 +948,6 @@
}
}
-
/**
* 获取当前车辆及空闲车辆
* @param request
@@ -973,7 +972,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 更换车辆
--
Gitblit v1.7.1