From 503bc89c55d675a27b689419aa906a070ca5cb03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 五月 2024 09:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 142 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 69 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index e9fe3e2..f1edc44 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -73,21 +73,21 @@
TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.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));
- model.addAttribute("czcOne",czcOne);
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.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));
- model.addAttribute("czcThree",czcThree);
+ //接送机推单(第一轮)
+ TSysPushOrder jsjOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 1));
+ model.addAttribute("jsjOne",jsjOne);
+ //接送机推单(第二轮)
+ TSysPushOrder jsjTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 2));
+ model.addAttribute("jsjTwo",jsjTwo);
+ //接送机推单(第三轮)
+ TSysPushOrder jsjThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 3));
+ model.addAttribute("jsjThree",jsjThree);
//普通取消设置(专车)
TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.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", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 7));
model.addAttribute("ptCancel2",ptCancel2);
//普通取消设置(跨城出行)
TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
@@ -96,8 +96,8 @@
//预约取消设置(专车)
TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.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", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 7));
model.addAttribute("yyCancel2",yyCancel2);
//报警电话
@@ -119,22 +119,24 @@
@RequestMapping(value = "/setUp")
@ResponseBody
public Object setUp(@RequestParam BigDecimal one, @RequestParam Integer two, @RequestParam Integer three, @RequestParam Integer openValue,
- @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,
+ @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,@RequestParam Integer isTransfer,
@RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,
@RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,
@RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,
- @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
- @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
- @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
+ @RequestParam Double jsj1,@RequestParam Integer jsj2,@RequestParam Double jsj3,
+ @RequestParam Double jsj4,@RequestParam Integer jsj5,@RequestParam Double jsj6,
+ @RequestParam Double jsj7,@RequestParam Integer jsj8,@RequestParam Double jsj9,
@RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
@RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
- @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3) {
+ @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String userQrCode,@RequestParam String driverQrCode) {
//改派设置
TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(reformist)){
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
+ reformist.setUserQrCode(userQrCode);
+ reformist.setDriverQrCode(driverQrCode);
tSysReformistService.updateById(reformist);
}else{
reformist = new TSysReformist();
@@ -142,6 +144,8 @@
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
+ reformist.setUserQrCode(userQrCode);
+ reformist.setDriverQrCode(driverQrCode);
tSysReformistService.insert(reformist);
}
@@ -223,56 +227,56 @@
tSysPushOrderService.insert(zcThree);
}
- //出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
- if (SinataUtil.isNotEmpty(czcOne)){
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- tSysPushOrderService.updateById(czcOne);
+ //接送机推单(第一轮)
+ TSysPushOrder jsjOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 1));
+ if (SinataUtil.isNotEmpty(jsjOne)){
+ jsjOne.setPushDistance(jsj1);
+ jsjOne.setPushTime(jsj2);
+ jsjOne.setDriverProportion(jsj3);
+ tSysPushOrderService.updateById(jsjOne);
}else{
- czcOne = new TSysPushOrder();
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
- czcOne.setPushType(2);
- czcOne.setType(1);
- tSysPushOrderService.insert(czcOne);
+ jsjOne = new TSysPushOrder();
+ jsjOne.setPushDistance(jsj1);
+ jsjOne.setPushTime(jsj2);
+ jsjOne.setDriverProportion(jsj3);
+ jsjOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjOne.setPushType(7);
+ jsjOne.setType(1);
+ tSysPushOrderService.insert(jsjOne);
}
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
- if (SinataUtil.isNotEmpty(czcTwo)){
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- tSysPushOrderService.updateById(czcTwo);
+ //接送机推单(第二轮)
+ TSysPushOrder jsjTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 2));
+ if (SinataUtil.isNotEmpty(jsjTwo)){
+ jsjTwo.setPushDistance(jsj4);
+ jsjTwo.setPushTime(jsj5);
+ jsjTwo.setDriverProportion(jsj6);
+ tSysPushOrderService.updateById(jsjTwo);
}else{
- czcTwo = new TSysPushOrder();
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
- czcTwo.setPushType(2);
- czcTwo.setType(2);
- tSysPushOrderService.insert(czcTwo);
+ jsjTwo = new TSysPushOrder();
+ jsjTwo.setPushDistance(jsj4);
+ jsjTwo.setPushTime(jsj5);
+ jsjTwo.setDriverProportion(jsj6);
+ jsjTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjTwo.setPushType(7);
+ jsjTwo.setType(2);
+ tSysPushOrderService.insert(jsjTwo);
}
- //出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
- if (SinataUtil.isNotEmpty(czcThree)){
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- tSysPushOrderService.updateById(czcThree);
+ //接送机推单(第三轮)
+ TSysPushOrder jsjThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 3));
+ if (SinataUtil.isNotEmpty(jsjThree)){
+ jsjThree.setPushDistance(jsj7);
+ jsjThree.setPushTime(jsj8);
+ jsjThree.setDriverProportion(jsj9);
+ tSysPushOrderService.updateById(jsjThree);
}else{
- czcThree = new TSysPushOrder();
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
- czcThree.setPushType(2);
- czcThree.setType(3);
- tSysPushOrderService.insert(czcThree);
+ jsjThree = new TSysPushOrder();
+ jsjThree.setPushDistance(jsj7);
+ jsjThree.setPushTime(jsj8);
+ jsjThree.setDriverProportion(jsj9);
+ jsjThree.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjThree.setPushType(7);
+ jsjThree.setType(3);
+ tSysPushOrderService.insert(jsjThree);
}
//普通取消设置(专车)
@@ -291,8 +295,8 @@
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", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 7));
if (SinataUtil.isNotEmpty(ptCancelTwo)){
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
@@ -303,7 +307,7 @@
ptCancelTwo.setMoney(ptCancel4);
ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
ptCancelTwo.setType(1);
- ptCancelTwo.setOrderType(2);
+ ptCancelTwo.setOrderType(7);
tSysCancleOrderService.insert(ptCancelTwo);
}
@@ -338,8 +342,8 @@
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", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 7));
if (SinataUtil.isNotEmpty(yyCancelTwo)){
yyCancelTwo.setMinuteNum(yyCancel3);
yyCancelTwo.setMoney(yyCancel4);
@@ -350,7 +354,7 @@
yyCancelTwo.setMoney(yyCancel4);
yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
yyCancelTwo.setType(2);
- yyCancelTwo.setOrderType(2);
+ yyCancelTwo.setOrderType(7);
tSysCancleOrderService.insert(yyCancelTwo);
}
--
Gitblit v1.7.1