From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 406 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 245 insertions(+), 161 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index 81f6980..c952541 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
@@ -62,6 +64,8 @@
private IDriverAssessmentService driverAssessmentService;
@Autowired
private ITSysOverTimeService sysOverTimeService;
+ @Autowired
+ private IRedEnvelopePaymentSettingsService redEnvelopePaymentSettingsService;
/**
* 2.0新增红包支付设置
@@ -76,11 +80,11 @@
List<String> strings = new ArrayList<>();
strings.add("updateTime");
// 查询生效的红包折扣比例
- List<TSysRedSet> isDelete = sysRedSetService.selectList(new EntityWrapper<TSysRedSet>()
- .eq("isDelete", 0)
+ List<RedEnvelopePaymentSettings> isDelete = redEnvelopePaymentSettingsService.selectList(new EntityWrapper<RedEnvelopePaymentSettings>()
+ .eq("status", 1)
.orderDesc(strings));
if (isDelete.size()>0){
- model.addAttribute("new",isDelete.get(0).getProportion());
+ model.addAttribute("new",isDelete.get(0).getDeductionRatio());
}else{
model.addAttribute("new","_");
}
@@ -88,20 +92,20 @@
}
@RequestMapping("/redSet/updateHtml/{id}")
public String updateHtml(@PathVariable("id") Integer id,Model model) {
- TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
+ RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);
List<String> strings = new ArrayList<>();
strings.add("updateTime");
// 查询生效的红包折扣比例
- List<TSysRedSet> isDelete = sysRedSetService.selectList(new EntityWrapper<TSysRedSet>()
- .eq("isDelete", 0)
+ List<RedEnvelopePaymentSettings> isDelete = redEnvelopePaymentSettingsService.selectList(new EntityWrapper<RedEnvelopePaymentSettings>()
+ .eq("status", 1)
.orderDesc(strings));
if (isDelete.size()>0){
- model.addAttribute("new",isDelete.get(0).getProportion());
+ model.addAttribute("new",isDelete.get(0).getDeductionRatio());
}else{
model.addAttribute("new","_");
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
- String format = simpleDateFormat.format(tSysRedSet.getStartTime());
+ String format = simpleDateFormat.format(tSysRedSet.getEffectiveDate());
model.addAttribute("time",format);
model.addAttribute("data",tSysRedSet);
@@ -121,7 +125,11 @@
if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
}else{
- page.setRecords(sysRedSetService.getList(page));
+ List<Map<String, Object>> list = sysRedSetService.getList(page);
+ for (Map<String, Object> stringObjectMap : list) {
+ stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
+ }
+ page.setRecords(list);
}
return super.packForBT(page);
}
@@ -129,16 +137,21 @@
@ResponseBody
public Object redSetAdd(String proportion, String startTime) throws ParseException {
// 新增红包设置
- TSysRedSet tSysRedSet = new TSysRedSet();
+ RedEnvelopePaymentSettings tSysRedSet = new RedEnvelopePaymentSettings();
+ RedEnvelopePaymentSettings redEnvelopePaymentSettings = new RedEnvelopePaymentSettings();
String name = ShiroKit.getUser().getName();
- tSysRedSet.setHandle(name);
- tSysRedSet.setProportion(proportion);
+
+ tSysRedSet.setInsertUserId(ShiroKit.getUser().getId());
+
+ tSysRedSet.setDeductionRatio(new BigDecimal(proportion));
String replace = startTime.replace("T", " ");
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
- tSysRedSet.setStartTime(date);
- sysRedSetService.insert(tSysRedSet);
+ tSysRedSet.setInsertTime(new Date());
+ tSysRedSet.setEffectiveDate(date);
+ tSysRedSet.setStatus(1);
+ redEnvelopePaymentSettingsService.insert(tSysRedSet);
return SUCCESS_TIP;
}
@@ -146,17 +159,17 @@
@ResponseBody
public Object redSetUpdate(Integer id,String proportion, String startTime) throws ParseException {
// 修改红包设置
- TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
+ RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);
String name = ShiroKit.getUser().getName();
- tSysRedSet.setHandle(name);
- tSysRedSet.setProportion(proportion);
+ tSysRedSet.setInsertUserId(ShiroKit.getUser().getId());
+ tSysRedSet.setDeductionRatio(new BigDecimal(proportion));
String replace = startTime.replace("T", " ");
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
- tSysRedSet.setStartTime(date);
+ tSysRedSet.setInsertTime(date);
tSysRedSet.setUpdateTime(new Date());
- sysRedSetService.updateById(tSysRedSet);
+ redEnvelopePaymentSettingsService.updateById(tSysRedSet);
return SUCCESS_TIP;
}
@@ -164,9 +177,9 @@
@ResponseBody
public Object redSetDelete(Integer id) {
// 删除红包设置
- TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
- tSysRedSet.setIsDelete(1);
- sysRedSetService.updateById(tSysRedSet);
+ RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);
+ tSysRedSet.setStatus(3);
+ redEnvelopePaymentSettingsService.updateById(tSysRedSet);
return SUCCESS_TIP;
}
/**
@@ -213,21 +226,60 @@
//普通取消设置(专车)
TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>()
- .eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+ .eq("companyId", ShiroKit.getUser().getObjectId()));
model.addAttribute("ptCancel1",ptCancel1);
//普通取消设置(出租车)
TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>()
- .eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ .eq("companyId", ShiroKit.getUser().getObjectId()));
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", ShiroKit.getUser().getObjectId()));
model.addAttribute("ptCancel3",ptCancel3);
+ // 司机超时
+ JSONObject jsonObject = JSON.parseObject(ptCancel1.getContent());
+ model.addAttribute("driverTimeout",jsonObject.getIntValue("driverTimeout"));
+ // 订单取消规则
+ JSONObject order = jsonObject.getJSONObject("order");
+ String orderAcceptanceTime = order.getString("orderAcceptanceTime");
+ String money = order.getString("money");
+ String mileageFee = order.getString("mileageFee");
+ String durationFee = order.getString("durationFee");
+ // 接单xx分钟后
+ model.addAttribute("orderAcceptanceTime",orderAcceptanceTime);
+ // 取消订单金额
+ model.addAttribute("money",money);
+ // 时长费
+ model.addAttribute("mileageFee",mileageFee);
+ // 分钟
+ model.addAttribute("durationFee",durationFee);
+ // 预约单取消规则
+ JSONObject reservationOrder = jsonObject.getJSONObject("reservationOrder");
+ String orderAcceptanceTime1 = reservationOrder.getString("orderAcceptanceTime");
+ String money1 = reservationOrder.getString("money");
+ String mileageFee1 = reservationOrder.getString("mileageFee");
+ String durationFee1 = reservationOrder.getString("durationFee");
+ String reservationFee = reservationOrder.getString("reservationFee");
+ // 预约单接单xx分钟后
+ model.addAttribute("orderAcceptanceTime1",orderAcceptanceTime1);
+ // 预约单取消订单金额
+ model.addAttribute("money1",money1);
+ // 预约单时长费
+ model.addAttribute("mileageFee1",mileageFee1);
+ // 预约单分钟
+ model.addAttribute("durationFee1",durationFee1);
+ // 预定费用
+ model.addAttribute("reservationFee",reservationFee);
+ // 超时设置
+
+ TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ model.addAttribute("overTime",overTime);
+
//预约取消设置(专车)
- 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", ShiroKit.getUser().getObjectId()));
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()));
model.addAttribute("yyCancel2",yyCancel2);
//报警电话
@@ -242,10 +294,7 @@
//司机考勤
DriverAssessment driverAssessment = driverAssessmentService.selectOne(new EntityWrapper<DriverAssessment>().eq("companyId", ShiroKit.getUser().getObjectId()));
model.addAttribute("assessment", driverAssessment == null ? "" : driverAssessment.getAssessment());
- // 超时设置
- TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>()
- .eq("companyId", ShiroKit.getUser().getObjectId()));
- model.addAttribute("overTime", overTime);
+
return PREFIX + "tSysReformist.html";
}
@@ -266,12 +315,12 @@
@RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
@RequestParam Double zcAssignOrder,@RequestParam Double czcAssignOrder,
@RequestParam Integer zcPeople,@RequestParam Integer czcPeople,
- @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 Integer ptCancel1,@RequestParam String ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
+ @RequestParam Integer yyCancel1,@RequestParam String yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
@RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String assessment,
- @RequestParam String km,@RequestParam Integer kmMinute,@RequestParam String km2,
- @RequestParam Integer kmMinute2,
+ @RequestParam String km,@RequestParam String kmMinute,@RequestParam String km2,
+ @RequestParam String kmMinute2,
@RequestParam Integer overtime,@RequestParam Integer overtime1,@RequestParam Integer packageTime,
@RequestParam Integer reserveTime,
@RequestParam Integer reserveNext,@RequestParam String reserveMoney
@@ -449,137 +498,172 @@
assignOrder.setPeople(czcPeople);
assignOrderService.insert(assignOrder1);
}
-
- //普通取消设置(专车)
- TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
- if (SinataUtil.isNotEmpty(ptCancelOne)){
- ptCancelOne.setMinuteNum(ptCancel1);
- ptCancelOne.setMoney(ptCancel2);
-
- ptCancelOne.setKm(Integer.valueOf(km));
- ptCancelOne.setKmMinute(kmMinute);
- ptCancelOne.setOvertime(overtime);
-
- tSysCancleOrderService.updateById(ptCancelOne);
- }else{
- ptCancelOne = new TSysCancleOrder();
- ptCancelOne.setMinuteNum(ptCancel1);
- ptCancelOne.setMoney(ptCancel2);
- ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
- ptCancelOne.setType(1);
- ptCancelOne.setOrderType(1);
- ptCancelOne.setKm(Integer.valueOf(km));
- ptCancelOne.setKmMinute(kmMinute);
- ptCancelOne.setOvertime(overtime);
-
- tSysCancleOrderService.insert(ptCancelOne);
+ TSysCancleOrder cancleOrder = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ // {"order":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5},"reservationOrder":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5,"reservationFee":5},"driverTimeout":10}
+ // 将数据拼接为json格式存储
+ if (ptCancel1 == null){
+ ptCancel1 = 0;
}
-
- //普通取消设置(出租车)
- TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
- if (SinataUtil.isNotEmpty(ptCancelTwo)){
- ptCancelTwo.setMinuteNum(ptCancel3);
- ptCancelTwo.setMoney(ptCancel4);
-
- ptCancelTwo.setKm(Integer.valueOf(km));
- ptCancelTwo.setKmMinute(kmMinute);
- ptCancelTwo.setOvertime(overtime);
- tSysCancleOrderService.updateById(ptCancelTwo);
- }else{
- ptCancelTwo = new TSysCancleOrder();
- ptCancelTwo.setMinuteNum(ptCancel3);
- ptCancelTwo.setMoney(ptCancel4);
- ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
-
- ptCancelTwo.setKm(Integer.valueOf(km));
- ptCancelTwo.setKmMinute(kmMinute);
- ptCancelTwo.setOvertime(overtime);
- ptCancelTwo.setType(1);
- ptCancelTwo.setOrderType(2);
- tSysCancleOrderService.insert(ptCancelTwo);
+ if (ptCancel2 == null){
+ ptCancel2 = "0";
}
-
- //普通取消设置(跨城出行)
- TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
- if (SinataUtil.isNotEmpty(ptCancelThree)){
- ptCancelThree.setMinuteNum(ptCancel5);
- ptCancelThree.setMoney(ptCancel6);
-
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- ptCancelThree.setKm(Integer.valueOf(km));
- ptCancelThree.setKmMinute(kmMinute);
- ptCancelThree.setOvertime(overtime);
- ptCancelThree.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.updateById(ptCancelThree);
- }else{
- ptCancelThree = new TSysCancleOrder();
- ptCancelThree.setMinuteNum(ptCancel5);
- ptCancelThree.setMoney(ptCancel6);
- ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
- ptCancelThree.setType(1);
- ptCancelThree.setOrderType(3);
-
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- ptCancelThree.setKm(Integer.valueOf(km));
- ptCancelThree.setKmMinute(kmMinute);
- ptCancelThree.setOvertime(overtime);
- ptCancelThree.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.insert(ptCancelThree);
+ if (yyCancel2 == null){
+ yyCancel2 = "0";
}
-
- //预约取消设置(专车)
- TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
- if (SinataUtil.isNotEmpty(yyCancelOne)){
- yyCancelOne.setMinuteNum(yyCancel1);
- yyCancelOne.setMoney(yyCancel2);
-
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- yyCancelOne.setKm(Integer.valueOf(km2));
- yyCancelOne.setKmMinute(kmMinute2);
- yyCancelOne.setOvertime(overtime);
- yyCancelOne.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.updateById(yyCancelOne);
- }else{
- yyCancelOne = new TSysCancleOrder();
- yyCancelOne.setMinuteNum(yyCancel1);
- yyCancelOne.setMoney(yyCancel2);
- yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
- yyCancelOne.setType(2);
- yyCancelOne.setOrderType(1);
-
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- yyCancelOne.setKm(Integer.valueOf(km2));
- yyCancelOne.setKmMinute(kmMinute2);
- yyCancelOne.setOvertime(overtime);
- yyCancelOne.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.insert(yyCancelOne);
+ if (yyCancel1 == null){
+ yyCancel1 = 0;
}
- //预约取消设置(出租车)
- TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
- if (SinataUtil.isNotEmpty(yyCancelTwo)){
- yyCancelTwo.setMinuteNum(yyCancel3);
- yyCancelTwo.setMoney(yyCancel4);
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- yyCancelTwo.setKm(Integer.valueOf(km2));
- yyCancelTwo.setKmMinute(kmMinute2);
- yyCancelTwo.setOvertime(overtime);
- yyCancelTwo.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.updateById(yyCancelTwo);
- }else{
- yyCancelTwo = new TSysCancleOrder();
- yyCancelTwo.setMinuteNum(yyCancel3);
- yyCancelTwo.setMoney(yyCancel4);
- yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
- yyCancelTwo.setType(2);
- yyCancelTwo.setOrderType(2);
-
- BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
- yyCancelTwo.setKm(Integer.valueOf(km2));
- yyCancelTwo.setKmMinute(kmMinute2);
- yyCancelTwo.setOvertime(overtime);
- yyCancelTwo.setReserveMoney(bigDecimal1);
- tSysCancleOrderService.insert(yyCancelTwo);
+ if (km == null){
+ km = "0";
+ }if (kmMinute == null){
+ kmMinute = "0";
}
+ if (km2 == null){
+ km2 = "0";
+ }if (kmMinute2 == null){
+ kmMinute2 = "0";
+ }if (reserveMoney == null){
+ reserveMoney = "0";
+ }if (overtime == null){
+ overtime = 0;
+ }
+ String result = "{\""+"order\":{\"orderAcceptanceTime\":"+ptCancel1+","+"\"money\":"+ptCancel2+","+"\"mileageFee\":"+km+","+"\"durationFee\":"+kmMinute+"},"+"\"reservationOrder\":{\"orderAcceptanceTime\":"+yyCancel1+","+"\"money\":"+yyCancel2+","+"\"mileageFee\":"+km2+","+"\"durationFee\":"+kmMinute2+","+"\"reservationFee\":"+reserveMoney+"},"+"\"driverTimeout\":"+overtime+"}";
+ System.err.println("看看");
+ System.err.println(result);
+ cancleOrder.setContent(result);
+ tSysCancleOrderService.updateById(cancleOrder);
+ // JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
+// map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
+// //普通取消设置(专车)
+// TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+// if (SinataUtil.isNotEmpty(ptCancelOne)){
+// ptCancelOne.setMinuteNum(ptCancel1);
+// ptCancelOne.setMoney(ptCancel2);
+//
+// ptCancelOne.setKm(Integer.valueOf(km));
+// ptCancelOne.setKmMinute(kmMinute);
+// ptCancelOne.setOvertime(overtime);
+//
+// tSysCancleOrderService.updateById(ptCancelOne);
+// }else{
+// ptCancelOne = new TSysCancleOrder();
+// ptCancelOne.setMinuteNum(ptCancel1);
+// ptCancelOne.setMoney(ptCancel2);
+// ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+// ptCancelOne.setType(1);
+// ptCancelOne.setOrderType(1);
+// ptCancelOne.setKm(Integer.valueOf(km));
+// ptCancelOne.setKmMinute(kmMinute);
+// ptCancelOne.setOvertime(overtime);
+//
+// tSysCancleOrderService.insert(ptCancelOne);
+// }
+//
+// //普通取消设置(出租车)
+// TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+// if (SinataUtil.isNotEmpty(ptCancelTwo)){
+// ptCancelTwo.setMinuteNum(ptCancel3);
+// ptCancelTwo.setMoney(ptCancel4);
+//
+// ptCancelTwo.setKm(Integer.valueOf(km));
+// ptCancelTwo.setKmMinute(kmMinute);
+// ptCancelTwo.setOvertime(overtime);
+// tSysCancleOrderService.updateById(ptCancelTwo);
+// }else{
+// ptCancelTwo = new TSysCancleOrder();
+// ptCancelTwo.setMinuteNum(ptCancel3);
+// ptCancelTwo.setMoney(ptCancel4);
+// ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+//
+// ptCancelTwo.setKm(Integer.valueOf(km));
+// ptCancelTwo.setKmMinute(kmMinute);
+// ptCancelTwo.setOvertime(overtime);
+// 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));
+// if (SinataUtil.isNotEmpty(ptCancelThree)){
+// ptCancelThree.setMinuteNum(ptCancel5);
+// ptCancelThree.setMoney(ptCancel6);
+//
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// ptCancelThree.setKm(Integer.valueOf(km));
+// ptCancelThree.setKmMinute(kmMinute);
+// ptCancelThree.setOvertime(overtime);
+// ptCancelThree.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.updateById(ptCancelThree);
+// }else{
+// ptCancelThree = new TSysCancleOrder();
+// ptCancelThree.setMinuteNum(ptCancel5);
+// ptCancelThree.setMoney(ptCancel6);
+// ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
+// ptCancelThree.setType(1);
+// ptCancelThree.setOrderType(3);
+//
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// ptCancelThree.setKm(Integer.valueOf(km));
+// ptCancelThree.setKmMinute(kmMinute);
+// ptCancelThree.setOvertime(overtime);
+// ptCancelThree.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.insert(ptCancelThree);
+// }
+//
+// //预约取消设置(专车)
+// TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+// if (SinataUtil.isNotEmpty(yyCancelOne)){
+// yyCancelOne.setMinuteNum(yyCancel1);
+// yyCancelOne.setMoney(yyCancel2);
+//
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// yyCancelOne.setKm(Integer.valueOf(km2));
+// yyCancelOne.setKmMinute(kmMinute2);
+// yyCancelOne.setOvertime(overtime);
+// yyCancelOne.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.updateById(yyCancelOne);
+// }else{
+// yyCancelOne = new TSysCancleOrder();
+// yyCancelOne.setMinuteNum(yyCancel1);
+// yyCancelOne.setMoney(yyCancel2);
+// yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+// yyCancelOne.setType(2);
+// yyCancelOne.setOrderType(1);
+//
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// yyCancelOne.setKm(Integer.valueOf(km2));
+// yyCancelOne.setKmMinute(kmMinute2);
+// yyCancelOne.setOvertime(overtime);
+// yyCancelOne.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.insert(yyCancelOne);
+// }
+// //预约取消设置(出租车)
+// TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+// if (SinataUtil.isNotEmpty(yyCancelTwo)){
+// yyCancelTwo.setMinuteNum(yyCancel3);
+// yyCancelTwo.setMoney(yyCancel4);
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// yyCancelTwo.setKm(Integer.valueOf(km2));
+// yyCancelTwo.setKmMinute(kmMinute2);
+// yyCancelTwo.setOvertime(overtime);
+// yyCancelTwo.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.updateById(yyCancelTwo);
+// }else{
+// yyCancelTwo = new TSysCancleOrder();
+// yyCancelTwo.setMinuteNum(yyCancel3);
+// yyCancelTwo.setMoney(yyCancel4);
+// yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+// yyCancelTwo.setType(2);
+// yyCancelTwo.setOrderType(2);
+//
+// BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+// yyCancelTwo.setKm(Integer.valueOf(km2));
+// yyCancelTwo.setKmMinute(kmMinute2);
+// yyCancelTwo.setOvertime(overtime);
+// yyCancelTwo.setReserveMoney(bigDecimal1);
+// tSysCancleOrderService.insert(yyCancelTwo);
+// }
//报警电话
TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
--
Gitblit v1.7.1