From 03565e00f7be08f2f6ace868298d70faf0930b91 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 27 五月 2024 09:07:01 +0800
Subject: [PATCH] 5.27

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 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 8e67d3e..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,9 @@
 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;
@@ -35,7 +38,7 @@
     @Autowired
     private IDriverService driverService;
     @Autowired
-    private SysReformist
+    private SysReformistMapper sysReformistMapper;
 
 
     /**
@@ -49,9 +52,20 @@
     @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();
@@ -59,24 +73,28 @@
         }
     }
 
-    @ResponseBody
-    @PostMapping("/queryWechatPic")
-    @ApiOperation(value = "获取客服二维码", tags = {"司机端-首页"})
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "当前定位行政区域编号", name = "code", required = true, dataType = "string"),
-    })
-    public ResultUtil queryCustomerWechat(String code, HttpServletRequest request){
-        try {
-            Integer uid = driverService.getUserIdFormRedis(request);
-            if(null == uid){
-                return ResultUtil.tokenErr();
-            }
-
-            return
-        }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