From 2ea7c30be31b05877e8324edb85d08173e07a8c6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 09:57:57 +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 | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 c9d299d..5e5f854 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
@@ -302,7 +302,7 @@
*/
@RequestMapping(value = "/setUp")
@ResponseBody
- public Object setUp(String type, BigDecimal one, Integer two, Integer three, Integer openValue,
+ public Object setUp(Integer openCityId, String type, BigDecimal one, Integer two, Integer three, Integer openValue,
Integer isSpecialCar,Integer isTaxiCar,
Double zc1,Integer zc2,Double zc3,
Double zc4,Integer zc5,Double zc6,
@@ -322,13 +322,14 @@
if("reassigningSet".equals(type)){
TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(reformist)){
+ reformist.setOpenCityId(openCityId);
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
tSysReformistService.updateById(reformist);
}else {
reformist = new TSysReformist();
- reformist.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ reformist.setOpenCityId(openCityId);
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
@@ -343,7 +344,6 @@
driverPayDaysService.updateById(tDriverPayDays);
}else {
tDriverPayDays = new TDriverPayDays();
- tDriverPayDays.setCompanyId(shiroExtUtil.getUser().getObjectId());
tDriverPayDays.setUpdateTime(new Date());
tDriverPayDays.setDay(driverDays);
driverPayDaysService.insert(tDriverPayDays);
@@ -354,11 +354,12 @@
if("integralSet".equals(type)){
TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(integral)){
+ integral.setOpenCityId(openCityId);
integral.setIntegral(two);
tSysIntegralService.updateById(integral);
}else {
integral = new TSysIntegral();
- integral.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ integral.setOpenCityId(openCityId);
integral.setIntegral(two);
tSysIntegralService.insert(integral);
}
@@ -368,6 +369,7 @@
if("faceRecognitionSettings".equals(type)){
TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(faceDistinguish)){
+ faceDistinguish.setOpenCityId(openCityId);
faceDistinguish.setIsOpen(three);
faceDistinguish.setMinuteNum(openValue);
tSysFaceDistinguishService.updateById(faceDistinguish);
@@ -375,7 +377,7 @@
faceDistinguish = new TSysFaceDistinguish();
faceDistinguish.setIsOpen(three);
faceDistinguish.setMinuteNum(openValue);
- faceDistinguish.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ faceDistinguish.setOpenCityId(openCityId);
tSysFaceDistinguishService.insert(faceDistinguish);
}
}
@@ -385,6 +387,7 @@
//快车推单(第一轮)
TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
if (SinataUtil.isNotEmpty(zcOne)){
+ zcOne.setOpenCityId(openCityId);
zcOne.setPushDistance(zc1);
zcOne.setPushTime(zc2);
zcOne.setDriverProportion(zc3);
@@ -394,7 +397,7 @@
zcOne.setPushDistance(zc1);
zcOne.setPushTime(zc2);
zcOne.setDriverProportion(zc3);
- zcOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ zcOne.setOpenCityId(openCityId);
zcOne.setPushType(1);
zcOne.setType(1);
tSysPushOrderService.insert(zcOne);
@@ -402,6 +405,7 @@
//快车推单(第二轮)
TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
if (SinataUtil.isNotEmpty(zcTwo)){
+ zcTwo.setOpenCityId(openCityId);
zcTwo.setPushDistance(zc4);
zcTwo.setPushTime(zc5);
zcTwo.setDriverProportion(zc6);
@@ -411,7 +415,7 @@
zcTwo.setPushDistance(zc4);
zcTwo.setPushTime(zc5);
zcTwo.setDriverProportion(zc6);
- zcTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ zcTwo.setOpenCityId(openCityId);
zcTwo.setPushType(1);
zcTwo.setType(2);
tSysPushOrderService.insert(zcTwo);
@@ -419,6 +423,7 @@
//快车推单(第三轮)
TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
if (SinataUtil.isNotEmpty(zcThree)){
+ zcThree.setOpenCityId(openCityId);
zcThree.setPushDistance(zc7);
zcThree.setPushTime(zc8);
zcThree.setDriverProportion(zc9);
@@ -428,7 +433,7 @@
zcThree.setPushDistance(zc7);
zcThree.setPushTime(zc8);
zcThree.setDriverProportion(zc9);
- zcThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ zcThree.setOpenCityId(openCityId);
zcThree.setPushType(1);
zcThree.setType(3);
tSysPushOrderService.insert(zcThree);
@@ -437,6 +442,7 @@
//出租车推单(第一轮)
TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
if (SinataUtil.isNotEmpty(czcOne)){
+ czcOne.setOpenCityId(openCityId);
czcOne.setPushDistance(czc1);
czcOne.setPushTime(czc2);
czcOne.setDriverProportion(czc3);
@@ -446,7 +452,7 @@
czcOne.setPushDistance(czc1);
czcOne.setPushTime(czc2);
czcOne.setDriverProportion(czc3);
- czcOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ czcOne.setOpenCityId(openCityId);
czcOne.setPushType(2);
czcOne.setType(1);
tSysPushOrderService.insert(czcOne);
@@ -454,6 +460,7 @@
//出租车推单(第二轮)
TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
if (SinataUtil.isNotEmpty(czcTwo)){
+ czcTwo.setOpenCityId(openCityId);
czcTwo.setPushDistance(czc4);
czcTwo.setPushTime(czc5);
czcTwo.setDriverProportion(czc6);
@@ -463,7 +470,7 @@
czcTwo.setPushDistance(czc4);
czcTwo.setPushTime(czc5);
czcTwo.setDriverProportion(czc6);
- czcTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ czcTwo.setOpenCityId(openCityId);
czcTwo.setPushType(2);
czcTwo.setType(2);
tSysPushOrderService.insert(czcTwo);
@@ -471,6 +478,7 @@
//出租车推单(第三轮)
TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
if (SinataUtil.isNotEmpty(czcThree)){
+ czcThree.setOpenCityId(openCityId);
czcThree.setPushDistance(czc7);
czcThree.setPushTime(czc8);
czcThree.setDriverProportion(czc9);
@@ -480,7 +488,7 @@
czcThree.setPushDistance(czc7);
czcThree.setPushTime(czc8);
czcThree.setDriverProportion(czc9);
- czcThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ czcThree.setOpenCityId(openCityId);
czcThree.setPushType(2);
czcThree.setType(3);
tSysPushOrderService.insert(czcThree);
@@ -492,6 +500,7 @@
//普通取消设置(快车)
TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
if (SinataUtil.isNotEmpty(ptCancelOne)){
+ ptCancelOne.setOpenCityId(openCityId);
ptCancelOne.setMinuteNum(ptCancel1);
ptCancelOne.setMoney(ptCancel2);
tSysCancleOrderService.updateById(ptCancelOne);
@@ -499,7 +508,7 @@
ptCancelOne = new TSysCancleOrder();
ptCancelOne.setMinuteNum(ptCancel1);
ptCancelOne.setMoney(ptCancel2);
- ptCancelOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ ptCancelOne.setOpenCityId(openCityId);
ptCancelOne.setType(1);
ptCancelOne.setOrderType(1);
tSysCancleOrderService.insert(ptCancelOne);
@@ -508,6 +517,7 @@
//普通取消设置(出租车)
TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
if (SinataUtil.isNotEmpty(ptCancelTwo)){
+ ptCancelTwo.setOpenCityId(openCityId);
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
tSysCancleOrderService.updateById(ptCancelTwo);
@@ -515,7 +525,7 @@
ptCancelTwo = new TSysCancleOrder();
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
- ptCancelTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ ptCancelTwo.setOpenCityId(openCityId);
ptCancelTwo.setType(1);
ptCancelTwo.setOrderType(2);
tSysCancleOrderService.insert(ptCancelTwo);
@@ -524,6 +534,7 @@
//普通取消设置(跨城出行)
TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
if (SinataUtil.isNotEmpty(ptCancelThree)){
+ ptCancelThree.setOpenCityId(openCityId);
ptCancelThree.setMinuteNum(ptCancel5);
ptCancelThree.setMoney(ptCancel6);
tSysCancleOrderService.updateById(ptCancelThree);
@@ -531,7 +542,7 @@
ptCancelThree = new TSysCancleOrder();
ptCancelThree.setMinuteNum(ptCancel5);
ptCancelThree.setMoney(ptCancel6);
- ptCancelThree.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ ptCancelThree.setOpenCityId(openCityId);
ptCancelThree.setType(1);
ptCancelThree.setOrderType(3);
tSysCancleOrderService.insert(ptCancelThree);
@@ -543,6 +554,7 @@
//预约取消设置(快车)
TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
if (SinataUtil.isNotEmpty(yyCancelOne)){
+ yyCancelOne.setOpenCityId(openCityId);
yyCancelOne.setMinuteNum(yyCancel1);
yyCancelOne.setMoney(yyCancel2);
tSysCancleOrderService.updateById(yyCancelOne);
@@ -550,7 +562,7 @@
yyCancelOne = new TSysCancleOrder();
yyCancelOne.setMinuteNum(yyCancel1);
yyCancelOne.setMoney(yyCancel2);
- yyCancelOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ yyCancelOne.setOpenCityId(openCityId);
yyCancelOne.setType(2);
yyCancelOne.setOrderType(1);
tSysCancleOrderService.insert(yyCancelOne);
@@ -558,6 +570,7 @@
//预约取消设置(出租车)
TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
if (SinataUtil.isNotEmpty(yyCancelTwo)){
+ yyCancelTwo.setOpenCityId(openCityId);
yyCancelTwo.setMinuteNum(yyCancel3);
yyCancelTwo.setMoney(yyCancel4);
tSysCancleOrderService.updateById(yyCancelTwo);
@@ -565,7 +578,7 @@
yyCancelTwo = new TSysCancleOrder();
yyCancelTwo.setMinuteNum(yyCancel3);
yyCancelTwo.setMoney(yyCancel4);
- yyCancelTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ yyCancelTwo.setOpenCityId(openCityId);
yyCancelTwo.setType(2);
yyCancelTwo.setOrderType(2);
tSysCancleOrderService.insert(yyCancelTwo);
@@ -583,11 +596,12 @@
jsonObject.put("num5", pdpd5);
jsonObject.put("num6", pdpd6);
if (SinataUtil.isNotEmpty(spellOrderRule)) {
+ spellOrderRule.setOpenCityId(openCityId);
spellOrderRule.setContent(jsonObject.toJSONString());
spellOrderRuleService.updateById(spellOrderRule);
} else {
spellOrderRule = new SpellOrderRule();
- spellOrderRule.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ spellOrderRule.setOpenCityId(openCityId);
spellOrderRule.setContent(jsonObject.toJSONString());
spellOrderRuleService.insert(spellOrderRule);
}
@@ -598,12 +612,13 @@
//报警电话
TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
if (SinataUtil.isNotEmpty(phoneOne)){
+ phoneOne.setOpenCityId(openCityId);
phoneOne.setPhone(phone1);
tPhoneService.updateById(phoneOne);
}else {
phoneOne = new TPhone();
phoneOne.setPhone(phone1);
- phoneOne.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ phoneOne.setOpenCityId(openCityId);
phoneOne.setType(1);
if (shiroExtUtil.getUser().getRoleType() == 1) {
phoneOne.setPlatform(1);
@@ -615,12 +630,13 @@
//客服电话
TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
if (SinataUtil.isNotEmpty(phoneTwo)){
+ phoneTwo.setOpenCityId(openCityId);
phoneTwo.setPhone(phone2);
tPhoneService.updateById(phoneTwo);
}else {
phoneTwo = new TPhone();
phoneTwo.setPhone(phone2);
- phoneTwo.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ phoneTwo.setOpenCityId(openCityId);
phoneTwo.setType(2);
if (shiroExtUtil.getUser().getRoleType() == 1) {
phoneTwo.setPlatform(1);
@@ -633,12 +649,13 @@
//客服电话
TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
if (SinataUtil.isNotEmpty(phone)){
+ phone.setOpenCityId(openCityId);
phone.setPhone(phone3);
tPhoneService.updateById(phone);
}else {
phone = new TPhone();
phone.setPhone(phone3);
- phone.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ phone.setOpenCityId(openCityId);
phone.setType(3);
if (shiroExtUtil.getUser().getRoleType() == 1) {
phone.setPlatform(1);
@@ -651,12 +668,13 @@
//招聘电话
TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
if (SinataUtil.isNotEmpty(phoneFive)){
+ phoneFive.setOpenCityId(openCityId);
phoneFive.setPhone(phone5);
tPhoneService.updateById(phoneFive);
}else {
phoneFive = new TPhone();
phoneFive.setPhone(phone5);
- phoneFive.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ phoneFive.setOpenCityId(openCityId);
phoneFive.setType(5);
if (shiroExtUtil.getUser().getRoleType() == 1) {
phoneFive.setPlatform(1);
@@ -672,12 +690,13 @@
//95128电召电话
TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
if (SinataUtil.isNotEmpty(phoneFour)){
+ phoneFour.setOpenCityId(openCityId);
phoneFour.setPhone(phone4);
tPhoneService.updateById(phoneFour);
}else {
phoneFour = new TPhone();
phoneFour.setPhone(phone4);
- phoneFour.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ phoneFour.setOpenCityId(openCityId);
phoneFour.setType(4);
if (shiroExtUtil.getUser().getRoleType() == 1) {
phoneFour.setPlatform(1);
@@ -702,6 +721,7 @@
if("timeoutDeductionSettings".equals(type)){
timeoutMoneyService.delete(new EntityWrapper<TSysTimeoutMoney>().ne("id",0));
TSysTimeoutMoney tSysTimeoutMoney = new TSysTimeoutMoney();
+ tSysTimeoutMoney.setOpenCityId(openCityId);
tSysTimeoutMoney.setDeductMoney(deductMoney);
tSysTimeoutMoney.setTimeOut(timeOut);
timeoutMoneyService.insert(tSysTimeoutMoney);
@@ -725,10 +745,12 @@
showModular1.setType(1);
showModular1.setDriverShow(sjzp2);
showModular1.setUserShow(sjzp1);
+ showModular1.setOpenCityId(openCityId);
showModularService.insert(showModular1);
}else{
showModular1.setDriverShow(sjzp2);
showModular1.setUserShow(sjzp1);
+ showModular1.setOpenCityId(openCityId);
showModularService.updateById(showModular1);
}
//租车
@@ -738,10 +760,12 @@
showModular2.setType(2);
showModular2.setDriverShow(zuc2);
showModular2.setUserShow(zuc1);
+ showModular2.setOpenCityId(openCityId);
showModularService.insert(showModular2);
}else{
showModular2.setDriverShow(zuc2);
showModular2.setUserShow(zuc1);
+ showModular2.setOpenCityId(openCityId);
showModularService.updateById(showModular2);
}
//买车
@@ -751,10 +775,12 @@
showModular3.setType(3);
showModular3.setDriverShow(mc2);
showModular3.setUserShow(mc1);
+ showModular3.setOpenCityId(openCityId);
showModularService.insert(showModular3);
}else{
showModular3.setDriverShow(mc2);
showModular3.setUserShow(mc1);
+ showModular3.setOpenCityId(openCityId);
showModularService.updateById(showModular3);
}
//出租个人车辆
@@ -764,10 +790,12 @@
showModular4.setType(4);
showModular4.setDriverShow(czgrcl2);
showModular4.setUserShow(czgrcl1);
+ showModular4.setOpenCityId(openCityId);
showModularService.insert(showModular4);
}else{
showModular4.setDriverShow(czgrcl2);
showModular4.setUserShow(czgrcl1);
+ showModular4.setOpenCityId(openCityId);
showModularService.updateById(showModular4);
}
//卖车
@@ -777,10 +805,12 @@
showModular5.setType(5);
showModular5.setDriverShow(mac2);
showModular5.setUserShow(mac1);
+ showModular5.setOpenCityId(openCityId);
showModularService.insert(showModular5);
}else{
showModular5.setDriverShow(mac2);
showModular5.setUserShow(mac1);
+ showModular5.setOpenCityId(openCityId);
showModularService.updateById(showModular5);
}
//商家中心
@@ -790,10 +820,12 @@
showModular6.setType(6);
showModular6.setDriverShow(sjzx2);
showModular6.setUserShow(sjzx1);
+ showModular6.setOpenCityId(openCityId);
showModularService.insert(showModular6);
}else{
showModular6.setDriverShow(sjzx2);
showModular6.setUserShow(sjzx1);
+ showModular6.setOpenCityId(openCityId);
showModularService.updateById(showModular6);
}
//打车卡
@@ -803,10 +835,12 @@
showModular7.setType(7);
showModular7.setDriverShow(dck2);
showModular7.setUserShow(dck1);
+ showModular7.setOpenCityId(openCityId);
showModularService.insert(showModular7);
}else{
showModular7.setDriverShow(dck2);
showModular7.setUserShow(dck1);
+ showModular7.setOpenCityId(openCityId);
showModularService.updateById(showModular7);
}
}
--
Gitblit v1.7.1