From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
index 3a423d7..0dcfdc6 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
@@ -1,6 +1,13 @@
package com.stylefeng.guns.modular.api;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.netflix.ribbon.proxy.annotation.Http;
+import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
+import com.stylefeng.guns.modular.system.model.Driver;
+import com.stylefeng.guns.modular.system.model.DriverService;
import com.stylefeng.guns.modular.system.model.Phone;
+import com.stylefeng.guns.modular.system.model.SysReformist;
+import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IPhoneService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import io.swagger.annotations.Api;
@@ -13,6 +20,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.naming.ldap.PagedResultsControl;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -26,7 +35,10 @@
@Autowired
private IPhoneService phoneService;
-
+ @Autowired
+ private IDriverService driverService;
+ @Autowired
+ private SysReformistMapper sysReformistMapper;
/**
@@ -40,13 +52,49 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
})
- public ResultUtil queryCustomerPhone(String code){
+ public ResultUtil queryCustomerPhone(String code,HttpServletRequest request){
try {
- Map<String, Object> map = phoneService.queryCustomerPhone(code);
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ String wechat = "";
+ Driver driver = driverService.selectById(uid);
+ List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
+ for (SysReformist sysReformist : companyId) {
+ wechat = sysReformist.getDriverQrCode();
+ }
+
+ Map<String, Object> map = phoneService.queryCustomerPhone(code,wechat);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+// @ResponseBody
+// @PostMapping("/queryWechatPic")
+// @ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+// })
+// public ResultUtil queryCustomerWechat(HttpServletRequest request){
+// try {
+// Integer uid = driverService.getUserIdFormRedis(request);
+// if(null == uid){
+// return ResultUtil.tokenErr();
+// }
+// Driver driver = driverService.selectById(uid);
+// List<SysReformist> companyId = sysReformistMapper.selectList(new EntityWrapper<SysReformist>().eq("companyId", driver.getCompanyId()));
+// for (SysReformist sysReformist : companyId) {
+// return ResultUtil.success(sysReformist.getDriverQrCode());
+// }
+//
+// }catch (Exception e){
+// e.printStackTrace();
+// return ResultUtil.runErr();
+// }
+// return ResultUtil.error("请稍后重试");
+// }
}
--
Gitblit v1.7.1