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/resources/application-dev.yml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml | 9
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java | 54 ++++
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java | 18 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java | 28 ++
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js | 12
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java | 11
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 92 ++----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 406 ++++++++++++++++++------------
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java | 101 -------
12 files changed, 411 insertions(+), 330 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));
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java
new file mode 100644
index 0000000..eb863b3
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java
@@ -0,0 +1,11 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.RedEnvelopePaymentSettings;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/4/15 15:07
+ */
+public interface RedEnvelopePaymentSettingsMapper extends BaseMapper<RedEnvelopePaymentSettings> {
+}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml
new file mode 100644
index 0000000..3be0f74
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.RedEnvelopePaymentSettingsMapper">
+
+
+</mapper>
\ No newline at end of file
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
index 3abadcd..06d64a1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
@@ -4,9 +4,10 @@
<select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- select *
- from t_red_set
- where t_red_set.isDelete = 0
- order by updateTime desc
+ select t_red_envelope_payment_settings.*,sys_user.name as handle
+ from t_red_envelope_payment_settings
+ left join sys_user on t_red_envelope_payment_settings.insertUserId = sys_user.id
+ where t_red_envelope_payment_settings.status = 1
+ order by insertTime desc
</select>
</mapper>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java
new file mode 100644
index 0000000..9afb691
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java
@@ -0,0 +1,54 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/4/15 15:04
+ */
+@Data
+@TableName("t_red_envelope_payment_settings")
+public class RedEnvelopePaymentSettings {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ public Integer id;
+ /**
+ * 红包抵扣比例
+ */
+ @TableField("deductionRatio")
+ private BigDecimal deductionRatio;
+ /**
+ * 生效日期
+ */
+ @TableField("effectiveDate")
+ private Date effectiveDate;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 修改时间
+ */
+ @TableField("updateTime")
+ private Date updateTime;
+ /**
+ * 添加人id
+ */
+ @TableField("insertUserId")
+ private Integer insertUserId;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("status")
+ private Integer status;
+}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
index fbd260f..9e7a3c5 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -24,110 +25,24 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
+ * 主键
*/
@TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
private Integer id;
/**
* 企业id
*/
+ @TableField("companyId")
private Integer companyId;
/**
- * 时间(分钟)
+ * 取消规则
*/
- private Integer minuteNum;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- *预定费用
- */
- private BigDecimal reserveMoney;
- /**
- *取消里程费
- */
- private Integer km;
- /**
- * 司机超时xx分钟 未到达指定地点 用户取消订单 不收取费用
- */
- private Integer overtime;
- /**
- * 取消时长费
- */
- private Integer kmMinute;
- /**
- * 1=普通单取消，2=预约单取消
- */
- private Integer type;
- /**
- * 1=专车，2=出租车,3=跨城出行
- */
- private Integer orderType;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getMinuteNum() {
- return minuteNum;
- }
-
- public void setMinuteNum(Integer minuteNum) {
- this.minuteNum = minuteNum;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
+ @TableField("content")
+ private String content;
@Override
protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysCancleOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", minuteNum=" + minuteNum +
- ", money=" + money +
- ", type=" + type +
- ", orderType=" + orderType +
- "}";
+ return null;
}
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java
new file mode 100644
index 0000000..9346280
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java
@@ -0,0 +1,18 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.RedEnvelopePaymentSettings;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/4/15 15:08
+ */
+public interface IRedEnvelopePaymentSettingsService extends IService<RedEnvelopePaymentSettings> {
+
+
+ /**
+ * 获取当前执行的红包支付配置
+ * @return
+ */
+ RedEnvelopePaymentSettings getRedEnvelopePaymentSettings();
+}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java
new file mode 100644
index 0000000..823e33a
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.RedEnvelopePaymentSettingsMapper;
+import com.stylefeng.guns.modular.system.model.RedEnvelopePaymentSettings;
+import com.stylefeng.guns.modular.system.service.IRedEnvelopePaymentSettingsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/4/15 15:08
+ */
+@Service
+public class RedEnvelopePaymentSettingsServiceImpl extends ServiceImpl<RedEnvelopePaymentSettingsMapper, RedEnvelopePaymentSettings> implements IRedEnvelopePaymentSettingsService {
+
+ /**
+ * 获取当前执行的红包支付配置
+ * @return
+ */
+ @Override
+ public RedEnvelopePaymentSettings getRedEnvelopePaymentSettings() {
+ RedEnvelopePaymentSettings redEnvelopePaymentSettings = this.selectOne(new EntityWrapper<RedEnvelopePaymentSettings>()
+ .eq("status", 1)
+ .last(" and now() >= effectiveDate order by effectiveDate desc limit 0, 1"));
+ return redEnvelopePaymentSettings;
+ }
+}
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
index be09c3a..4b37a89 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -42,7 +42,7 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
+ url: jdbc:mysql://192.168.110.80:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
username: root
# password: HjKbXilb9zajmXbl
password: 123456
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
index 9a67828..1986aec 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
@@ -14,7 +14,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">红包可抵扣比例：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" id="proportion" value="${data.proportion}" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
+ <input style="width: 300px" class="form-control" id="proportion" value="${data.deductionRatio}" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
<span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">%</span>
</div>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index d6a98a5..258d15d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -305,81 +305,65 @@
<label class="col-sm-2 control-label">打车/包裹订单取消设置：</label>
<div class="col-sm-10">
订单取消规则：订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.minuteNum}"
+ @if(isNotEmpty(orderAcceptanceTime)){
+ value="${orderAcceptanceTime}"
@}else{
value=""
@}
name="ptCancel1" id="ptCancel1" class="form-control newWidth" /> 分钟后，
取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.money}"
+ @if(isNotEmpty(money)){
+ value="${money}"
@}else{
value=""
@}
name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> GHS取消费用
里程费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.km}"
+ @if(isNotEmpty(mileageFee)){
+ value="${mileageFee}"
@}else{
value=""
@}
name="km" id="km" class="form-control newWidth" /> GHS/km
时长费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.kmMinute}"
+ @if(isNotEmpty(durationFee)){
+ value="${durationFee}"
@}else{
value=""
@}
name="kmMinute" id="kmMinute" class="form-control newWidth" /> GHS/分钟
<br/>
<br/>
- <div class="col-sm-10" hidden>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.minuteNum}"
- @}else{
- value=""
- @}
- name="ptCancel3" id="ptCancel3" class="form-control newWidth" /> 分钟后，
- 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.money}"
- @}else{
- value=""
- @}
- name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
- <br/>
- </div>
+
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">预约订单取消规则：</label>
<div class="col-sm-10">
订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.minuteNum}"
+ @if(isNotEmpty(orderAcceptanceTime1)){
+ value="${orderAcceptanceTime1}"
@}else{
value=""
@}
name="yyCancel1" id="yyCancel1" class="form-control newWidth" /> 分钟后，
取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.money}"
+ @if(isNotEmpty(money1)){
+ value="${money1}"
@}else{
value=""
@}
name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
里程费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.km}"
+ @if(isNotEmpty(mileageFee1)){
+ value="${mileageFee1}"
@}else{
value=""
@}
name="km2" id="km2" class="form-control newWidth" /> GHS/km
时长费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.kmMinute}"
+ @if(isNotEmpty(durationFee1)){
+ value="${durationFee1}"
@}else{
value=""
@}
@@ -387,39 +371,23 @@
</br>
</br>
预定费用 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.reserveMoney}"
+ @if(isNotEmpty(reservationFee)){
+ value="${reservationFee}"
@}else{
value=""
@}
name="reserveMoney" id="reserveMoney" class="form-control newWidth" /> GHS
<br/>
<br/>
- <div class="col-sm-10" hidden>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(yyCancel2)){
- value="${yyCancel2.minuteNum}"
- @}else{
- value=""
- @}
- name="yyCancel3" id="yyCancel3" class="form-control newWidth" /> 分钟后，
- 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel2)){
- value="${yyCancel2.money}"
- @}else{
- value=""
- @}
- name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用
- <br/>
- </div>
+
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">司机超时(地图计算时间或者预定时间)：</label>
<div class="col-sm-10">
<input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.overtime}"
+ @if(isNotEmpty(driverTimeout)){
+ value="${driverTimeout}"
@}else{
value=""
@}
@@ -613,15 +581,15 @@
var ptCancel1 = $("#ptCancel1").val().trim();
var ptCancel2 = $("#ptCancel2").val().trim();
- var ptCancel3 = $("#ptCancel3").val().trim();
- var ptCancel4 = $("#ptCancel4").val().trim();
+ // var ptCancel3 = $("#ptCancel3").val().trim();
+ // var ptCancel4 = $("#ptCancel4").val().trim();
// var ptCancel5 = $("#ptCancel5").val().trim();
// var ptCancel6 = $("#ptCancel6").val().trim();
var yyCancel1 = $("#yyCancel1").val().trim();
var yyCancel2 = $("#yyCancel2").val().trim();
- var yyCancel3 = $("#yyCancel3").val().trim();
- var yyCancel4 = $("#yyCancel4").val().trim();
+ // var yyCancel3 = $("#yyCancel3").val().trim();
+ // var yyCancel4 = $("#yyCancel4").val().trim();
var phone1 = $("#phone1").val().trim();
var phone2 = $("#phone2").val().trim();
@@ -719,15 +687,15 @@
ajax.set("ptCancel1", ptCancel1);
ajax.set("ptCancel2", ptCancel2);
- ajax.set("ptCancel3", ptCancel3);
- ajax.set("ptCancel4", ptCancel4);
+ ajax.set("ptCancel3", null);
+ ajax.set("ptCancel4", null);
ajax.set("ptCancel5", 0);
ajax.set("ptCancel6", 0);
ajax.set("yyCancel1", yyCancel1);
ajax.set("yyCancel2", yyCancel2);
- ajax.set("yyCancel3", yyCancel3);
- ajax.set("yyCancel4", yyCancel4);
+ ajax.set("yyCancel3", null);
+ ajax.set("yyCancel4", null);
ajax.set("phone1", phone1);
ajax.set("phone2", phone2);
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
index a5c4f0f..ea7f157 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
@@ -20,17 +20,13 @@
{title: '操作人', field: 'handle', visible: true, align: 'center', valign: 'middle',
},
- {title: '红包可抵扣比例', field: 'proportion', visible: true, align: 'center', valign: 'middle',
+ {title: '红包可抵扣比例', field: 'deductionRatio', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
- if(row.proportion != '' && row.proportion != null) {
- var time = row.proportion;
- btn = time+"%"
- }
- return btn;
+
+ return value+"%";
}
},
- {title: '生效时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
+ {title: '生效时间', field: 'effectiveDate', visible: true, align: 'center', valign: 'middle',},
];
};
--
Gitblit v1.7.1