From 61b2d479bf4887902d21c5c99d9b65bf9cc8d27a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:56:08 +0800
Subject: [PATCH] 提交代码

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java |  112 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index e9fe3e2..7949375 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.SinataUtil;
 import com.stylefeng.guns.modular.system.model.*;
@@ -47,6 +48,9 @@
     @Autowired
     private ITPhoneService tPhoneService;
 
+    @Autowired
+    private ShiroExtUtil shiroExtUtil;
+
 
     /**
      * 跳转到系统设置首页
@@ -54,60 +58,60 @@
     @RequestMapping("")
     public String index(Model model) {
         //改派设置
-        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         model.addAttribute("reformist",reformist);
         //积分设置
-        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         model.addAttribute("integral",integral);
         //人脸识别
-        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         model.addAttribute("faceDistinguish",faceDistinguish);
 
         //专车推单(第一轮)
-        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
+        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
         model.addAttribute("zcOne",zcOne);
         //专车推单(第二轮)
-        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
+        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
         model.addAttribute("zcTwo",zcTwo);
         //专车推单(第三轮)
-        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
+        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
         model.addAttribute("zcThree",zcThree);
 
         //出租车推单(第一轮)
-        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
         model.addAttribute("czcOne",czcOne);
         //出租车推单(第二轮)
-        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
         model.addAttribute("czcTwo",czcTwo);
         //出租车推单(第三轮)
-        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
         model.addAttribute("czcThree",czcThree);
 
         //普通取消设置(专车)
-        TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+        TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
         model.addAttribute("ptCancel1",ptCancel1);
         //普通取消设置(出租车)
-        TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+        TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
         model.addAttribute("ptCancel2",ptCancel2);
         //普通取消设置(跨城出行)
-        TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
+        TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
         model.addAttribute("ptCancel3",ptCancel3);
 
         //预约取消设置(专车)
-        TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+        TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
         model.addAttribute("yyCancel1",yyCancel1);
         //预约取消设置(出租车)
-        TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+        TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
         model.addAttribute("yyCancel2",yyCancel2);
 
         //报警电话
-        TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
+        TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
         model.addAttribute("phone1",phone1);
         //客服电话
-        TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
+        TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
         model.addAttribute("phone2",phone2);
         //客服电话
-        TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
+        TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
         model.addAttribute("phone3",phone3);
         return PREFIX + "tSysReformist.html";
     }
@@ -130,7 +134,7 @@
                         @RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
                         @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3) {
         //改派设置
-        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         if (SinataUtil.isNotEmpty(reformist)){
             reformist.setMoney(one);
             reformist.setIsSpecialCar(isSpecialCar);
@@ -138,7 +142,7 @@
             tSysReformistService.updateById(reformist);
         }else{
             reformist = new TSysReformist();
-            reformist.setCompanyId(ShiroKit.getUser().getObjectId());
+            reformist.setCompanyId(shiroExtUtil.getUser().getObjectId());
             reformist.setMoney(one);
             reformist.setIsSpecialCar(isSpecialCar);
             reformist.setIsTaxiCar(isTaxiCar);
@@ -146,19 +150,19 @@
         }
 
         //积分设置
-        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         if (SinataUtil.isNotEmpty(integral)){
             integral.setIntegral(two);
             tSysIntegralService.updateById(integral);
         }else{
             integral = new TSysIntegral();
-            integral.setCompanyId(ShiroKit.getUser().getObjectId());
+            integral.setCompanyId(shiroExtUtil.getUser().getObjectId());
             integral.setIntegral(two);
             tSysIntegralService.insert(integral);
         }
 
         //人脸识别
-        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
+        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
         if (SinataUtil.isNotEmpty(faceDistinguish)){
             faceDistinguish.setIsOpen(three);
             faceDistinguish.setMinuteNum(openValue);
@@ -167,12 +171,12 @@
             faceDistinguish = new TSysFaceDistinguish();
             faceDistinguish.setIsOpen(three);
             faceDistinguish.setMinuteNum(openValue);
-            faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
+            faceDistinguish.setCompanyId(shiroExtUtil.getUser().getObjectId());
             tSysFaceDistinguishService.insert(faceDistinguish);
         }
 
         //专车推单(第一轮)
-        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
+        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
         if (SinataUtil.isNotEmpty(zcOne)){
             zcOne.setPushDistance(zc1);
             zcOne.setPushTime(zc2);
@@ -183,13 +187,13 @@
             zcOne.setPushDistance(zc1);
             zcOne.setPushTime(zc2);
             zcOne.setDriverProportion(zc3);
-            zcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+            zcOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
             zcOne.setPushType(1);
             zcOne.setType(1);
             tSysPushOrderService.insert(zcOne);
         }
         //专车推单(第二轮)
-        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
+        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
         if (SinataUtil.isNotEmpty(zcTwo)){
             zcTwo.setPushDistance(zc4);
             zcTwo.setPushTime(zc5);
@@ -200,13 +204,13 @@
             zcTwo.setPushDistance(zc4);
             zcTwo.setPushTime(zc5);
             zcTwo.setDriverProportion(zc6);
-            zcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+            zcTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
             zcTwo.setPushType(1);
             zcTwo.setType(2);
             tSysPushOrderService.insert(zcTwo);
         }
         //专车推单(第三轮)
-        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
+        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
         if (SinataUtil.isNotEmpty(zcThree)){
             zcThree.setPushDistance(zc7);
             zcThree.setPushTime(zc8);
@@ -217,14 +221,14 @@
             zcThree.setPushDistance(zc7);
             zcThree.setPushTime(zc8);
             zcThree.setDriverProportion(zc9);
-            zcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+            zcThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
             zcThree.setPushType(1);
             zcThree.setType(3);
             tSysPushOrderService.insert(zcThree);
         }
 
         //出租车推单(第一轮)
-        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
         if (SinataUtil.isNotEmpty(czcOne)){
             czcOne.setPushDistance(czc1);
             czcOne.setPushTime(czc2);
@@ -235,13 +239,13 @@
             czcOne.setPushDistance(czc1);
             czcOne.setPushTime(czc2);
             czcOne.setDriverProportion(czc3);
-            czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+            czcOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
             czcOne.setPushType(2);
             czcOne.setType(1);
             tSysPushOrderService.insert(czcOne);
         }
         //出租车推单(第二轮)
-        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
         if (SinataUtil.isNotEmpty(czcTwo)){
             czcTwo.setPushDistance(czc4);
             czcTwo.setPushTime(czc5);
@@ -252,13 +256,13 @@
             czcTwo.setPushDistance(czc4);
             czcTwo.setPushTime(czc5);
             czcTwo.setDriverProportion(czc6);
-            czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+            czcTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
             czcTwo.setPushType(2);
             czcTwo.setType(2);
             tSysPushOrderService.insert(czcTwo);
         }
         //出租车推单(第三轮)
-        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
         if (SinataUtil.isNotEmpty(czcThree)){
             czcThree.setPushDistance(czc7);
             czcThree.setPushTime(czc8);
@@ -269,14 +273,14 @@
             czcThree.setPushDistance(czc7);
             czcThree.setPushTime(czc8);
             czcThree.setDriverProportion(czc9);
-            czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+            czcThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
             czcThree.setPushType(2);
             czcThree.setType(3);
             tSysPushOrderService.insert(czcThree);
         }
 
         //普通取消设置(专车)
-        TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+        TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
         if (SinataUtil.isNotEmpty(ptCancelOne)){
             ptCancelOne.setMinuteNum(ptCancel1);
             ptCancelOne.setMoney(ptCancel2);
@@ -285,14 +289,14 @@
             ptCancelOne = new TSysCancleOrder();
             ptCancelOne.setMinuteNum(ptCancel1);
             ptCancelOne.setMoney(ptCancel2);
-            ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+            ptCancelOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
             ptCancelOne.setType(1);
             ptCancelOne.setOrderType(1);
             tSysCancleOrderService.insert(ptCancelOne);
         }
 
         //普通取消设置(出租车)
-        TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+        TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
         if (SinataUtil.isNotEmpty(ptCancelTwo)){
             ptCancelTwo.setMinuteNum(ptCancel3);
             ptCancelTwo.setMoney(ptCancel4);
@@ -301,14 +305,14 @@
             ptCancelTwo = new TSysCancleOrder();
             ptCancelTwo.setMinuteNum(ptCancel3);
             ptCancelTwo.setMoney(ptCancel4);
-            ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+            ptCancelTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
             ptCancelTwo.setType(1);
             ptCancelTwo.setOrderType(2);
             tSysCancleOrderService.insert(ptCancelTwo);
         }
 
         //普通取消设置(跨城出行)
-        TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
+        TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
         if (SinataUtil.isNotEmpty(ptCancelThree)){
             ptCancelThree.setMinuteNum(ptCancel5);
             ptCancelThree.setMoney(ptCancel6);
@@ -317,14 +321,14 @@
             ptCancelThree = new TSysCancleOrder();
             ptCancelThree.setMinuteNum(ptCancel5);
             ptCancelThree.setMoney(ptCancel6);
-            ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
+            ptCancelThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
             ptCancelThree.setType(1);
             ptCancelThree.setOrderType(3);
             tSysCancleOrderService.insert(ptCancelThree);
         }
 
         //预约取消设置(专车)
-        TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+        TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
         if (SinataUtil.isNotEmpty(yyCancelOne)){
             yyCancelOne.setMinuteNum(yyCancel1);
             yyCancelOne.setMoney(yyCancel2);
@@ -333,13 +337,13 @@
             yyCancelOne = new TSysCancleOrder();
             yyCancelOne.setMinuteNum(yyCancel1);
             yyCancelOne.setMoney(yyCancel2);
-            yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+            yyCancelOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
             yyCancelOne.setType(2);
             yyCancelOne.setOrderType(1);
             tSysCancleOrderService.insert(yyCancelOne);
         }
         //预约取消设置(出租车)
-        TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+        TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
         if (SinataUtil.isNotEmpty(yyCancelTwo)){
             yyCancelTwo.setMinuteNum(yyCancel3);
             yyCancelTwo.setMoney(yyCancel4);
@@ -348,23 +352,23 @@
             yyCancelTwo = new TSysCancleOrder();
             yyCancelTwo.setMinuteNum(yyCancel3);
             yyCancelTwo.setMoney(yyCancel4);
-            yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+            yyCancelTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
             yyCancelTwo.setType(2);
             yyCancelTwo.setOrderType(2);
             tSysCancleOrderService.insert(yyCancelTwo);
         }
 
         //报警电话
-        TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
+        TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
         if (SinataUtil.isNotEmpty(phoneOne)){
             phoneOne.setPhone(phone1);
             tPhoneService.updateById(phoneOne);
         }else{
             phoneOne = new TPhone();
             phoneOne.setPhone(phone1);
-            phoneOne.setCompanyId(ShiroKit.getUser().getObjectId());
+            phoneOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
             phoneOne.setType(1);
-            if (ShiroKit.getUser().getRoleType() == 1){
+            if (shiroExtUtil.getUser().getRoleType() == 1){
                 phoneOne.setPlatform(1);
             }else{
                 phoneOne.setPlatform(2);
@@ -372,16 +376,16 @@
             tPhoneService.insert(phoneOne);
         }
         //客服电话
-        TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
+        TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
         if (SinataUtil.isNotEmpty(phoneTwo)){
             phoneTwo.setPhone(phone2);
             tPhoneService.updateById(phoneTwo);
         }else{
             phoneTwo = new TPhone();
             phoneTwo.setPhone(phone2);
-            phoneTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+            phoneTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
             phoneTwo.setType(2);
-            if (ShiroKit.getUser().getRoleType() == 1){
+            if (shiroExtUtil.getUser().getRoleType() == 1){
                 phoneTwo.setPlatform(1);
             }else{
                 phoneTwo.setPlatform(2);
@@ -390,16 +394,16 @@
         }
 
         //客服电话
-        TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
+        TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
         if (SinataUtil.isNotEmpty(phone)){
             phone.setPhone(phone3);
             tPhoneService.updateById(phone);
         }else{
             phone = new TPhone();
             phone.setPhone(phone3);
-            phone.setCompanyId(ShiroKit.getUser().getObjectId());
+            phone.setCompanyId(shiroExtUtil.getUser().getObjectId());
             phone.setType(3);
-            if (ShiroKit.getUser().getRoleType() == 1){
+            if (shiroExtUtil.getUser().getRoleType() == 1){
                 phone.setPlatform(1);
             }else{
                 phone.setPlatform(2);

--
Gitblit v1.7.1