From a73f1ac7a2d006b207f06534604100e01f6119a5 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 21 八月 2025 01:12:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 5e5f854..6f93b29 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
@@ -320,7 +320,7 @@
Integer dck1, Integer dck2,Integer driverDays) {
//改派设置
if("reassigningSet".equals(type)){
- TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
if (SinataUtil.isNotEmpty(reformist)){
reformist.setOpenCityId(openCityId);
reformist.setMoney(one);
@@ -337,7 +337,7 @@
}
}
if("driverPayDays".equals(type)){
- TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", shiroExtUtil.getUser().getObjectId()));
+ TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("openCityId", openCityId));
if (SinataUtil.isNotEmpty(tDriverPayDays)){
tDriverPayDays.setDay(driverDays);
tDriverPayDays.setUpdateTime(new Date());
@@ -352,7 +352,7 @@
//积分设置
if("integralSet".equals(type)){
- TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("openCityId", openCityId));
if (SinataUtil.isNotEmpty(integral)){
integral.setOpenCityId(openCityId);
integral.setIntegral(two);
@@ -367,7 +367,7 @@
//人脸识别
if("faceRecognitionSettings".equals(type)){
- TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("openCityId", openCityId));
if (SinataUtil.isNotEmpty(faceDistinguish)){
faceDistinguish.setOpenCityId(openCityId);
faceDistinguish.setIsOpen(three);
@@ -385,7 +385,7 @@
//推单设置
if("pushOrderSettings".equals(type)){
//快车推单(第一轮)
- TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
+ TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 1));
if (SinataUtil.isNotEmpty(zcOne)){
zcOne.setOpenCityId(openCityId);
zcOne.setPushDistance(zc1);
@@ -403,7 +403,7 @@
tSysPushOrderService.insert(zcOne);
}
//快车推单(第二轮)
- TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
+ TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 2));
if (SinataUtil.isNotEmpty(zcTwo)){
zcTwo.setOpenCityId(openCityId);
zcTwo.setPushDistance(zc4);
@@ -421,7 +421,7 @@
tSysPushOrderService.insert(zcTwo);
}
//快车推单(第三轮)
- TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
+ TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 3));
if (SinataUtil.isNotEmpty(zcThree)){
zcThree.setOpenCityId(openCityId);
zcThree.setPushDistance(zc7);
@@ -440,7 +440,7 @@
}
//出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+ TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 1));
if (SinataUtil.isNotEmpty(czcOne)){
czcOne.setOpenCityId(openCityId);
czcOne.setPushDistance(czc1);
@@ -458,7 +458,7 @@
tSysPushOrderService.insert(czcOne);
}
//出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+ TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 2));
if (SinataUtil.isNotEmpty(czcTwo)){
czcTwo.setOpenCityId(openCityId);
czcTwo.setPushDistance(czc4);
@@ -476,7 +476,7 @@
tSysPushOrderService.insert(czcTwo);
}
//出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+ TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 3));
if (SinataUtil.isNotEmpty(czcThree)){
czcThree.setOpenCityId(openCityId);
czcThree.setPushDistance(czc7);
@@ -498,7 +498,7 @@
//取消设置
if("cancelOrderSettings".equals(type)){
//普通取消设置(快车)
- TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+ TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 1));
if (SinataUtil.isNotEmpty(ptCancelOne)){
ptCancelOne.setOpenCityId(openCityId);
ptCancelOne.setMinuteNum(ptCancel1);
@@ -515,7 +515,7 @@
}
//普通取消设置(出租车)
- TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 2));
if (SinataUtil.isNotEmpty(ptCancelTwo)){
ptCancelTwo.setOpenCityId(openCityId);
ptCancelTwo.setMinuteNum(ptCancel3);
@@ -532,7 +532,7 @@
}
//普通取消设置(跨城出行)
- TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
+ TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 3));
if (SinataUtil.isNotEmpty(ptCancelThree)){
ptCancelThree.setOpenCityId(openCityId);
ptCancelThree.setMinuteNum(ptCancel5);
@@ -552,7 +552,7 @@
//预约取消设置
if("cancelTheReservationOrderSetting".equals(type)){
//预约取消设置(快车)
- TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+ TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 1));
if (SinataUtil.isNotEmpty(yyCancelOne)){
yyCancelOne.setOpenCityId(openCityId);
yyCancelOne.setMinuteNum(yyCancel1);
@@ -568,7 +568,7 @@
tSysCancleOrderService.insert(yyCancelOne);
}
//预约取消设置(出租车)
- TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+ TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 2));
if (SinataUtil.isNotEmpty(yyCancelTwo)){
yyCancelTwo.setOpenCityId(openCityId);
yyCancelTwo.setMinuteNum(yyCancel3);
@@ -587,7 +587,7 @@
//拼单派单
if("spellOrderSetting".equals(type)) {
- SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("openCityId", openCityId));
JSONObject jsonObject = new JSONObject();
jsonObject.put("num1", pdpd1);
jsonObject.put("num2", pdpd2);
@@ -610,7 +610,7 @@
//电话设置
if("phoneSettings".equals(type)){
//报警电话
- TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
+ TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 1));
if (SinataUtil.isNotEmpty(phoneOne)){
phoneOne.setOpenCityId(openCityId);
phoneOne.setPhone(phone1);
@@ -628,7 +628,7 @@
tPhoneService.insert(phoneOne);
}
//客服电话
- TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
+ TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 2));
if (SinataUtil.isNotEmpty(phoneTwo)){
phoneTwo.setOpenCityId(openCityId);
phoneTwo.setPhone(phone2);
@@ -647,7 +647,7 @@
}
//客服电话
- TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
+ TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 3));
if (SinataUtil.isNotEmpty(phone)){
phone.setOpenCityId(openCityId);
phone.setPhone(phone3);
@@ -666,7 +666,7 @@
}
//招聘电话
- TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
+ TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 5));
if (SinataUtil.isNotEmpty(phoneFive)){
phoneFive.setOpenCityId(openCityId);
phoneFive.setPhone(phone5);
@@ -688,7 +688,7 @@
//95128
if("95128TheOnCall".equals(type)){
//95128电召电话
- TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
+ TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 4));
if (SinataUtil.isNotEmpty(phoneFour)){
phoneFour.setOpenCityId(openCityId);
phoneFour.setPhone(phone4);
--
Gitblit v1.7.1