From 25cf266e99714ac5d428e66b40ce272325c91dd8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 15:01:11 +0800
Subject: [PATCH] 修改管理后台账号和共享session等 屏蔽除出租车外的其他模块
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 210 +++++++++++++++++++---------------------------------
1 files changed, 77 insertions(+), 133 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index 27759f8..aed49e9 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -1,33 +1,21 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.domain.CarModel;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.shiro.ShiroKit;
-import com.stylefeng.guns.core.util.DepositExample;
-import com.stylefeng.guns.core.util.PaymentTypeEnum;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.cloudPayment.req.DepositReq;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.unionpay.upyzt.exception.UpyztException;
-import com.unionpay.upyzt.resp.DepositResp;
-import com.unionpay.upyzt.util.StringUtils;
-import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.websocket.SendHandler;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@@ -90,50 +78,6 @@
@Autowired
private ITElectricRecordService recordService;
- @RequestMapping ("/record")
- @ResponseBody
- public ResultUtil record(BigDecimal money,String orderNum ){
- System.out.println("============"+money+"========="+orderNum);
- DepositReq depositReq = new DepositReq();
- depositReq.setOutOrderNo(ToolUtil.getRandomString(32));
- //-
- depositReq.setAmount(money.multiply(new BigDecimal(100)).intValue()); // 支付金额
- depositReq.setBalanceAcctId("2008429872055963229");
- depositReq.setDepositType("1");
- depositReq.setPaymentType(PaymentTypeEnum.CUP_APP.getCode());
- //-
- depositReq.setPaymentTradeNo(orderNum);
- depositReq.setPaymentSucceededAt(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()));
- //-
- depositReq.setOrderNo(orderNum);
- depositReq.setOrderAmount(money.multiply(new BigDecimal(100)).longValue());
- depositReq.setProductName("充值金额");
- depositReq.setProductCount(1);
- depositReq.setNotifyUrl("http://zhentonggongsi.com:8010/api/placeOrder/notifyUrlOne");
- DepositResp depositResp = null;
- try {
- depositResp = DepositExample.create(depositReq);
- TElectricRecord tElectricRecord = new TElectricRecord();
- tElectricRecord.setMoney(money);
- tElectricRecord.setInsertTime(new Date());
- tElectricRecord.setOrderNum(orderNum);
- tElectricRecord.setComOrder(depositResp.getOutOrderNo());
- recordService.insert(tElectricRecord);
- } catch (UpyztException e) {
-// log.error(e.getMessage());
- e.printStackTrace();
- }
-
-
-
-
-
- System.err.println(depositResp);
-// log.info("支付充值成功:{}",depositResp);
-
-
- return ResultUtil.success();
- }
@RequestMapping ("/check-change/{id}")
@ResponseBody
@@ -172,7 +116,7 @@
@RequestMapping("/checklist")
@ResponseBody
public Object checklist(Model model) {
- Integer id = ShiroKit.getUser().getId();
+ Integer id = ShiroExtUtil.getUser().getId();
// List<TSystemPrice> tSystemPrices = priceService.selectList(new EntityWrapper<TSystemPrice>().eq("companyId", id).eq("type", 1).eq("state", 1));
// List<Integer> ids = new ArrayList<>();
// for (TSystemPrice tSystemPrice : tSystemPrices) {
@@ -216,73 +160,73 @@
@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);
//拼车设置
- SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroExtUtil.getUser().getObjectId()));
model.addAttribute("spellOrderRule", JSONObject.parseObject(spellOrderRule.getContent()));
//报警电话
- 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);
//95128电召电话
- TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
+ TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("type", 4));
model.addAttribute("phone4",phone4);
//招聘电话
- TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
+ TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("type", 5));
model.addAttribute("phone5",phone5);
//节假日服务费
- BigDecimal holidayFee = companyService.selectById(ShiroKit.getUser().getObjectId()).getHolidayFee();
+ BigDecimal holidayFee = companyService.selectById(ShiroExtUtil.getUser().getObjectId()).getHolidayFee();
model.addAttribute("holidayFee",holidayFee);
//超时扣款
TSysTimeoutMoney tSysTimeoutMoney = timeoutMoneyService.selectOne(null);
@@ -326,7 +270,7 @@
}
}
model.addAttribute("showModulars", map);
- TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroKit.getUser().getObjectId()));
+ TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroExtUtil.getUser().getObjectId()));
if(tDriverPayDays!=null){
model.addAttribute("driverDay", tDriverPayDays.getDay());
}else {
@@ -368,7 +312,7 @@
Integer dck1, Integer dck2,Integer driverDays) {
//改派设置
if("reassigningSet".equals(type)){
- 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);
@@ -376,7 +320,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);
@@ -384,14 +328,14 @@
}
}
if("driverPayDays".equals(type)){
- TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroKit.getUser().getObjectId()));
+ TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroExtUtil.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(tDriverPayDays)){
tDriverPayDays.setDay(driverDays);
tDriverPayDays.setUpdateTime(new Date());
driverPayDaysService.updateById(tDriverPayDays);
}else{
tDriverPayDays = new TDriverPayDays();
- tDriverPayDays.setCompanyId(ShiroKit.getUser().getObjectId());
+ tDriverPayDays.setCompanyId(ShiroExtUtil.getUser().getObjectId());
tDriverPayDays.setUpdateTime(new Date());
tDriverPayDays.setDay(driverDays);
driverPayDaysService.insert(tDriverPayDays);
@@ -400,13 +344,13 @@
//积分设置
if("integralSet".equals(type)){
- 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);
}
@@ -414,7 +358,7 @@
//人脸识别
if("faceRecognitionSettings".equals(type)){
- 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);
@@ -423,7 +367,7 @@
faceDistinguish = new TSysFaceDistinguish();
faceDistinguish.setIsOpen(three);
faceDistinguish.setMinuteNum(openValue);
- faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
+ faceDistinguish.setCompanyId(ShiroExtUtil.getUser().getObjectId());
tSysFaceDistinguishService.insert(faceDistinguish);
}
}
@@ -431,7 +375,7 @@
//推单设置
if("pushOrderSettings".equals(type)){
//快车推单(第一轮)
- 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);
@@ -442,13 +386,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);
@@ -459,13 +403,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);
@@ -476,14 +420,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);
@@ -494,13 +438,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);
@@ -511,13 +455,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);
@@ -528,7 +472,7 @@
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);
@@ -538,7 +482,7 @@
//取消设置
if("cancelOrderSettings".equals(type)){
//普通取消设置(快车)
- 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);
@@ -547,14 +491,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);
@@ -563,14 +507,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);
@@ -579,7 +523,7 @@
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);
@@ -589,7 +533,7 @@
//预约取消设置
if("cancelTheReservationOrderSetting".equals(type)){
//预约取消设置(快车)
- 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);
@@ -598,13 +542,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);
@@ -613,7 +557,7 @@
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);
@@ -622,7 +566,7 @@
//拼单派单
if("spellOrderSetting".equals(type)){
- SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroExtUtil.getUser().getObjectId()));
JSONObject jsonObject = new JSONObject();
jsonObject.put("num1", pdpd1);
jsonObject.put("num2", pdpd2);
@@ -635,7 +579,7 @@
spellOrderRuleService.updateById(spellOrderRule);
}else{
spellOrderRule = new SpellOrderRule();
- spellOrderRule.setCompanyId(ShiroKit.getUser().getObjectId());
+ spellOrderRule.setCompanyId(ShiroExtUtil.getUser().getObjectId());
spellOrderRule.setContent(jsonObject.toJSONString());
spellOrderRuleService.insert(spellOrderRule);
}
@@ -644,71 +588,71 @@
//电话设置
if("phoneSettings".equals(type)){
//报警电话
- 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{
+ } else {
phoneOne.setPlatform(2);
}
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{
+ } else {
phoneTwo.setPlatform(2);
}
tPhoneService.insert(phoneTwo);
}
//客服电话
- 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{
+ } else {
phone.setPlatform(2);
}
tPhoneService.insert(phone);
}
//招聘电话
- TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
+ TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("type", 5));
if (SinataUtil.isNotEmpty(phoneFive)){
phoneFive.setPhone(phone5);
tPhoneService.updateById(phoneFive);
}else{
phoneFive = new TPhone();
phoneFive.setPhone(phone5);
- phoneFive.setCompanyId(ShiroKit.getUser().getObjectId());
+ phoneFive.setCompanyId(ShiroExtUtil.getUser().getObjectId());
phoneFive.setType(5);
- if (ShiroKit.getUser().getRoleType() == 1){
+ if (ShiroExtUtil.getUser().getRoleType() == 1) {
phoneFive.setPlatform(1);
- }else{
+ } else {
phoneFive.setPlatform(2);
}
tPhoneService.insert(phoneFive);
@@ -718,18 +662,18 @@
//95128
if("95128TheOnCall".equals(type)){
//95128电召电话
- TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
+ TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("type", 4));
if (SinataUtil.isNotEmpty(phoneFour)){
phoneFour.setPhone(phone4);
tPhoneService.updateById(phoneFour);
}else{
phoneFour = new TPhone();
phoneFour.setPhone(phone4);
- phoneFour.setCompanyId(ShiroKit.getUser().getObjectId());
+ phoneFour.setCompanyId(ShiroExtUtil.getUser().getObjectId());
phoneFour.setType(4);
- if (ShiroKit.getUser().getRoleType() == 1){
+ if (ShiroExtUtil.getUser().getRoleType() == 1) {
phoneFour.setPlatform(1);
- }else{
+ } else {
phoneFour.setPlatform(2);
}
tPhoneService.insert(phoneFour);
@@ -739,7 +683,7 @@
/// 节假日服务费
if("holidayServiceFeeSetting".equals(type)){
- Integer companyId = ShiroKit.getUser().getObjectId();
+ Integer companyId = ShiroExtUtil.getUser().getObjectId();
TCompany company = companyService.selectById(companyId);
company.setHolidayFee(holidayFee);
companyService.updateById(company);
--
Gitblit v1.7.1