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/model/TDriverPayDays.java | 125
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java | 31
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java | 39
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java | 173 +-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html | 78 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml | 17
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java | 5
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js | 154 ++
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html | 26
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java | 179 ++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java | 81
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html | 480 +++---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java | 27
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java | 33
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html | 65
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js | 15
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java | 125
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java | 107 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java | 169 +-
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java | 119
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java | 205 +-
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java | 25
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java | 229 +-
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js | 26
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java | 151 +
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html | 48
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 314 +++-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html | 1053 ++++++++++++++
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js | 262 +++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 78
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java | 44
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java | 3
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html | 5
35 files changed, 3,448 insertions(+), 1,051 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
index fda6a88..9337bd5 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
@@ -82,7 +82,8 @@
log.error("获取token失败！{}", bizData.getString("resMsg"));
throw new Exception(jsonObject.getString("resMsg"));
}
- return bizData.getString("token");
+ JSONObject resData = bizData.getJSONObject("resData");
+ return resData.getString("token");
}
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
index 52a08c9..405f5e5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
@@ -11,12 +11,8 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.modular.system.model.TOpenCity;
-import com.stylefeng.guns.modular.system.model.TOpenCityBusiness;
-import com.stylefeng.guns.modular.system.model.TRegion;
-import com.stylefeng.guns.modular.system.service.ITOpenCityBusinessService;
-import com.stylefeng.guns.modular.system.service.ITOpenCityService;
-import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.GaoDeMapUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -27,10 +23,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 城市管理控制器
@@ -54,6 +48,42 @@
private ITOpenCityBusinessService tOpenCityBusinessService;
@Autowired
private ShiroExtUtil shiroExtUtil;
+
+ @Autowired
+ private ITSysReformistService tSysReformistService;
+
+ @Autowired
+ private ITSysIntegralService tSysIntegralService;
+
+ @Autowired
+ private ITSysFaceDistinguishService tSysFaceDistinguishService;
+
+ @Autowired
+ private ITSysPushOrderService tSysPushOrderService;
+
+ @Autowired
+ private ITSysCancleOrderService tSysCancleOrderService;
+
+ @Autowired
+ private ITPhoneService tPhoneService;
+
+ @Autowired
+ private ITCompanyService companyService;
+
+ @Autowired
+ private ISpellOrderRuleService spellOrderRuleService;
+
+ @Autowired
+ private IShowModularService showModularService;
+
+ @Autowired
+ private ITSysTimeoutMoneyService timeoutMoneyService;
+
+ @Autowired
+ private ITSysWithdrawalPoundageService sysWithdrawalPoundageService;
+
+ @Autowired
+ private ITDriverPayDaysService driverPayDaysService;
/**
* 跳转到城市管理首页
@@ -96,6 +126,135 @@
model.addAttribute("businessList",businessList);
return PREFIX + "tOpenCity_edit.html";
}
+
+ /**
+ * 跳转到基础配置
+ * @param tOpenCityId
+ * @param model
+ * @return
+ */
+ @RequestMapping("/tOpenCity_systemSet/{tOpenCityId}")
+ public String tOpenCity_systemSet(@PathVariable Integer tOpenCityId, Model model){
+ model.addAttribute("openCityId", tOpenCityId);//改派设置
+ TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", tOpenCityId));
+ model.addAttribute("reformist",reformist);
+ //积分设置
+ TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("openCityId", tOpenCityId));
+ model.addAttribute("integral",integral);
+ //人脸识别
+ TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("openCityId", tOpenCityId));
+ model.addAttribute("faceDistinguish",faceDistinguish);
+
+ //快车推单(第一轮)
+ TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 1).eq("type", 1));
+ model.addAttribute("zcOne",zcOne);
+ //快车推单(第二轮)
+ TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 1).eq("type", 2));
+ model.addAttribute("zcTwo",zcTwo);
+ //快车推单(第三轮)
+ TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 1).eq("type", 3));
+ model.addAttribute("zcThree",zcThree);
+
+ //出租车推单(第一轮)
+ TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 2).eq("type", 1));
+ model.addAttribute("czcOne",czcOne);
+ //出租车推单(第二轮)
+ TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 2).eq("type", 2));
+ model.addAttribute("czcTwo",czcTwo);
+ //出租车推单(第三轮)
+ TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", tOpenCityId).eq("pushType", 2).eq("type", 3));
+ model.addAttribute("czcThree",czcThree);
+
+ //普通取消设置(快车)
+ TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", tOpenCityId).eq("type", 1).eq("orderType", 1));
+ model.addAttribute("ptCancel1",ptCancel1);
+ //普通取消设置(出租车)
+ TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", tOpenCityId).eq("type", 1).eq("orderType", 2));
+ model.addAttribute("ptCancel2",ptCancel2);
+ //普通取消设置(跨城出行)
+ TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", tOpenCityId).eq("type", 1).eq("orderType", 3));
+ model.addAttribute("ptCancel3",ptCancel3);
+
+ //预约取消设置(快车)
+ TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", tOpenCityId).eq("type", 2).eq("orderType", 1));
+ model.addAttribute("yyCancel1",yyCancel1);
+ //预约取消设置(出租车)
+ TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", tOpenCityId).eq("type", 2).eq("orderType", 2));
+ model.addAttribute("yyCancel2",yyCancel2);
+
+ //拼车设置
+ SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("openCityId", tOpenCityId));
+ model.addAttribute("spellOrderRule", null == spellOrderRule ? "" : JSONObject.parseObject(spellOrderRule.getContent()));
+
+ //报警电话
+ TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", tOpenCityId).eq("type", 1));
+ model.addAttribute("phone1",phone1);
+ //客服电话
+ TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", tOpenCityId).eq("type", 2));
+ model.addAttribute("phone2",phone2);
+ //客服电话
+ TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", tOpenCityId).eq("type", 3));
+ model.addAttribute("phone3",phone3);
+ //95128电召电话
+ TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", tOpenCityId).eq("type", 4));
+ model.addAttribute("phone4",phone4);
+ //招聘电话
+ TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", tOpenCityId).eq("type", 5));
+ model.addAttribute("phone5",phone5);
+ //节假日服务费
+ BigDecimal holidayFee = companyService.selectById(shiroExtUtil.getUser().getObjectId()).getHolidayFee();
+ model.addAttribute("holidayFee",holidayFee);
+ //超时扣款
+ TSysTimeoutMoney tSysTimeoutMoney = timeoutMoneyService.selectOne(new EntityWrapper<TSysTimeoutMoney>().eq("openCityId", tOpenCityId));
+ model.addAttribute("tSysTimeoutMoney",tSysTimeoutMoney);
+ //提现手续费
+ TSysWithdrawalPoundage tSysWithdrawalPoundage = sysWithdrawalPoundageService.selectOne(null);
+ model.addAttribute("tSysWithdrawalPoundage",tSysWithdrawalPoundage);
+ //模块管理
+ List<ShowModular> showModulars = showModularService.selectList(new EntityWrapper<ShowModular>().eq("openCityId", tOpenCityId));
+ Map<String, Integer> map = new HashMap<>();
+ for (ShowModular showModular : showModulars) {
+ switch (showModular.getType()){
+ case 1:
+ map.put("sjzp1", showModular.getUserShow());
+ map.put("sjzp2", showModular.getDriverShow());
+ break;
+ case 2:
+ map.put("zuc1", showModular.getUserShow());
+ map.put("zuc2", showModular.getDriverShow());
+ break;
+ case 3:
+ map.put("mc1", showModular.getUserShow());
+ map.put("mc2", showModular.getDriverShow());
+ break;
+ case 4:
+ map.put("czgrcl1", showModular.getUserShow());
+ map.put("czgrcl2", showModular.getDriverShow());
+ break;
+ case 5:
+ map.put("mac1", showModular.getUserShow());
+ map.put("mac2", showModular.getDriverShow());
+ break;
+ case 6:
+ map.put("sjzx1", showModular.getUserShow());
+ map.put("sjzx2", showModular.getDriverShow());
+ break;
+ case 7:
+ map.put("dck1", showModular.getUserShow());
+ map.put("dck2", showModular.getDriverShow());
+ break;
+ }
+ }
+ model.addAttribute("showModulars", map);
+ TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(null);
+ if(tDriverPayDays!=null){
+ model.addAttribute("driverDay", tDriverPayDays.getDay());
+ }else {
+ model.addAttribute("driverDay", "");
+ }
+ return PREFIX + "tSysReformist.html";
+ }
+
@RequestMapping(value = "/change")
@ResponseBody
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);
}
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 23df0e6..53eebf1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -1,5 +1,8 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;
+import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
@@ -8,11 +11,12 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import com.stylefeng.guns.modular.system.model.TRegion;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
import com.stylefeng.guns.modular.system.model.TSystemPrice;
-import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
-import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
-import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import net.sf.json.JSONObject;
@@ -28,6 +32,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -52,19 +57,82 @@
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
@Autowired
- private IUserService userService;
+ private ITRegionService tRegionService;
@Autowired
private ShiroExtUtil shiroExtUtil;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
+ @Autowired
+ private ISystemPriceCityService systemPriceCityService;
+
+
+ /**
+ * 跳转到列表页
+ * @return
+ */
+ @RequestMapping("/showSystemPriceCity")
+ public String showSystemPriceCity(){
+ return PREFIX + "systemPriceCity.html";
+ }
+
+ /**
+ * 跳转到添加价格
+ * @return
+ */
+ @RequestMapping("/systemPriceCity_add")
+ public String systemPriceCity_add(Model model){
+ List<TServerCarmodel> tServerCarmodels = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ model.addAttribute("serverCarModelList", tServerCarmodels);
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ return PREFIX + "systemPriceCity_add.html";
+ }
+
+ /**
+ * 跳转到修改价格城市
+ * @return
+ */
+ @RequestMapping("/systemPriceCity_update")
+ public String systemPriceCity_update(Integer id, Model model){
+ SystemPriceCity systemPriceCity = systemPriceCityService.selectById(id);
+ model.addAttribute("item", systemPriceCity);
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ //市
+ TRegion code = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", systemPriceCity.getAreaCode()));
+ List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", code.getId()));
+ model.addAttribute("cityList",cityList);
+ //区
+ model.addAttribute("areaList", null);
+ if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+ code = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", systemPriceCity.getCityCode()));
+ List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", code.getId()));
+ model.addAttribute("areaList",areaList);
+ }
+ List<TServerCarmodel> tServerCarmodels = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", id).eq("state", 1).eq("type", 1));
+ tServerCarmodels.forEach(s->{
+ Optional<TSystemPrice> first = tSystemPrices.stream().filter(p -> p.getServerCarModelId().equals(s.getId())).findFirst();
+ if(first.isPresent()){
+ TSystemPrice tSystemPrice = first.get();
+ s.setObject(Base64.encode(JSON.toJSONString(tSystemPrice)));
+ }
+ });
+ model.addAttribute("serverCarModelList", tServerCarmodels);
+ TSystemPrice systemPrice = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", id).eq("state", 1).eq("type", 2));
+ model.addAttribute("zcPrice", Base64.encode(systemPrice.getContent()));
+ return PREFIX + "systemPriceCity_edit.html";
+ }
+
/**
* 跳转到快车价格设置首页
*/
@RequestMapping("/special")
- public String index() {
+ public String index(Integer id) {
return PREFIX + "tSystemPrice.html";
}
@@ -91,11 +159,10 @@
@RequestMapping("/taxi")
- public String taxi(Model model) {
- Integer id = shiroExtUtil.getUser().getId();
- TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 2).eq("companyId", id));
- if (SinataUtil.isNotEmpty(one)) {
- JSONObject json1 = JSONObject.fromObject(one.getContent());
+ public String taxi(String price, Model model) {
+ if(ToolUtil.isNotEmpty(price)){
+ price = Base64.decodeStr(price);
+ JSONObject json1 = JSONObject.fromObject(price);
model.addAttribute("json", json1);
}
return PREFIX + "taxiSet.html";
@@ -104,25 +171,39 @@
* 跳转到添加快车价格设置
*/
@RequestMapping("/tSystemPrice_add")
- public String tSystemPriceAdd(Model model) {
- //查询所有快车车型
- List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", shiroExtUtil.getUser().getObjectId()).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- List<TServerCarmodel> serverCarmodels = new ArrayList<>();
- for (TServerCarmodel tsc : modelList) {
- boolean b = true;
- for (TSystemPrice tsp : tSystemPrices) {
- if (tsc.getId() == tsp.getServerCarModelId()) {
- b = false;
- break;
- }
- }
- if (b) {
- serverCarmodels.add(tsc);
- }
+ public String tSystemPriceAdd(Integer id, String price, Model model) {
+ model.addAttribute("item", null);
+ model.addAttribute("content", null);
+ model.addAttribute("contentPutOne", null);
+ model.addAttribute("contentNotOne", null);
+ model.addAttribute("contentPutTwo", null);
+ model.addAttribute("contentNotTwo", null);
+ model.addAttribute("contentPutThree", null);
+ model.addAttribute("contentNotThree", null);
+ model.addAttribute("contentExclusive", null);
+ model.addAttribute("contentPrice", null);
+ if(ToolUtil.isNotEmpty(price)){
+ String s = Base64.decodeStr(price);
+ TSystemPrice tSystemPrice = JSON.parseObject(s, TSystemPrice.class);
+ model.addAttribute("item",tSystemPrice);
+ LogObjectHolder.me().set(tSystemPrice);
+
+ JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+ model.addAttribute("content",json);
+
+ model.addAttribute("contentPutOne", JSONObject.fromObject(tSystemPrice.getContentPutOne()));
+ model.addAttribute("contentNotOne", JSONObject.fromObject(tSystemPrice.getContentNotOne()));
+ model.addAttribute("contentPutTwo", JSONObject.fromObject(tSystemPrice.getContentPutTwo()));
+ model.addAttribute("contentNotTwo", JSONObject.fromObject(tSystemPrice.getContentNotTwo()));
+ model.addAttribute("contentPutThree", JSONObject.fromObject(tSystemPrice.getContentPutThree()));
+ model.addAttribute("contentNotThree", JSONObject.fromObject(tSystemPrice.getContentNotThree()));
+ model.addAttribute("contentExclusive", JSONObject.fromObject(tSystemPrice.getContentExclusive()));
+ model.addAttribute("contentPrice", JSONObject.fromObject(tSystemPrice.getContentPrice()));
}
- model.addAttribute("modelList",serverCarmodels);
- return PREFIX + "tSystemPrice_add.html";
+
+ TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
+ model.addAttribute("modelList", tServerCarmodel);
+ return PREFIX + "tSystemPrice_edit.html";
}
/**
@@ -167,7 +248,25 @@
return PREFIX + "tSystemPrice_edit.html";
}
-
+
+
+ /**
+ * 获取价格列表设置
+ * @param name
+ * @param time
+ * @return
+ */
+ @RequestMapping(value = "/queryList")
+ @ResponseBody
+ public Object queryList(String condition, String insertTime){
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(systemPriceCityService.queryList(page, condition, insertTime));
+ return super.packForBT(page);
+
+ }
+
+
+
/**
* 获取快车价格设置列表
*/
@@ -184,29 +283,58 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TSystemPrice tSystemPrice) {
- //判断当前公司是否添加过该快车车型价格配置
- int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
- .eq("type", 1)
- .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
- .eq("companyId", shiroExtUtil.getUser().getObjectId())
- .last(" and not FIND_IN_SET(state,'3')"));
- if (count > 0) {
- TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【" + one.getName() + "】已存在,请重新选择");
+ public Object add(SystemPriceCity systemPriceCity, String zcPrice, String czcPrice) {
+ if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getProvinceCode());
+ systemPriceCity.setProvinceCode(tRegion.getCode());
}
- tSystemPrice.setCompanyId(shiroExtUtil.getUser().getObjectId());
- tSystemPrice.setType(1);
+ if(ToolUtil.isNotEmpty(systemPriceCity.getCityCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getCityCode());
+ systemPriceCity.setCityCode(tRegion.getCode());
+ }
+ if(ToolUtil.isNotEmpty(systemPriceCity.getAreaCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getAreaCode());
+ systemPriceCity.setAreaCode(tRegion.getCode());
+ }
+
+
+ SystemPriceCity one = null;
+ if(null != systemPriceCity.getProvinceCode()){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .eq("cityCode", systemPriceCity.getCityCode()).eq("provinceCode", systemPriceCity.getProvinceCode()).ne("flag", 3));
+ }
+ if(null == one){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
+ if(null == one){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .ne("flag", 3));
+ if(null != one){
+ return new ErrorTip(500, "不能重复添加城市");
+ }
+ }else{
+ return new ErrorTip(500, "不能重复添加城市");
+ }
+ }else{
+ return new ErrorTip(500, "不能重复添加城市");
+ }
+ systemPriceCityService.insert(systemPriceCity);
+ //解析专车的价格配置
+ JSONArray jsonArray = JSON.parseArray(zcPrice);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ TSystemPrice tSystemPrice = jsonArray.getObject(i, TSystemPrice.class);
+ tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+ tSystemPrice.setType(1);
+ tSystemPrice.setState(1);
+ tSystemPriceService.insert(tSystemPrice);
+ }
+ //解析出出租车价格设置
+ TSystemPrice tSystemPrice = new TSystemPrice();
+ tSystemPrice.setContent(czcPrice);
+ tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+ tSystemPrice.setType(2);
tSystemPrice.setState(1);
tSystemPriceService.insert(tSystemPrice);
- new Thread(new Runnable() {
- @Override
- public void run() {
- if (pushMinistryOfTransport) {//上传数据
- pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
- }
- }
- }).start();
return SUCCESS_TIP;
}
@@ -219,7 +347,6 @@
TSystemPrice tSystemPrice = new TSystemPrice();
tSystemPrice.setContent(content);
tSystemPrice.setType(2);
- tSystemPrice.setCompanyId(id);
tSystemPriceService.insert(tSystemPrice);
} else {
tSystemPrice1.setContent(content);
@@ -234,29 +361,60 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TSystemPrice tSystemPrice) {
- TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
- if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
- //判断当前公司是否添加过该快车车型价格配置
- int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
- .eq("type", 1)
- .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
- .eq("companyId", shiroExtUtil.getUser().getObjectId())
- .last(" and not FIND_IN_SET(state,'3')"));
- if (count > 0){
- TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
- }
+ public Object update(SystemPriceCity systemPriceCity, String zcPrice, String czcPrice) {
+ if(ToolUtil.isNotEmpty(systemPriceCity.getProvinceCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getProvinceCode());
+ systemPriceCity.setProvinceCode(tRegion.getCode());
}
- tSystemPriceService.updateById(tSystemPrice);
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport) {//上传数据
- pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
+ if(ToolUtil.isNotEmpty(systemPriceCity.getCityCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getCityCode());
+ systemPriceCity.setCityCode(tRegion.getCode());
+ }
+ if(ToolUtil.isNotEmpty(systemPriceCity.getAreaCode())){
+ TRegion tRegion = tRegionService.selectById(systemPriceCity.getAreaCode());
+ systemPriceCity.setAreaCode(tRegion.getCode());
+ }
+
+
+ SystemPriceCity one = null;
+ if(null != systemPriceCity.getProvinceCode()){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .eq("cityCode", systemPriceCity.getCityCode()).eq("provinceCode", systemPriceCity.getProvinceCode()).ne("flag", 3));
+ }
+ if(null == one){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3));
+ if(null == one){
+ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode())
+ .ne("flag", 3));
+ if(null != one && !systemPriceCity.getId().equals(one.getId())){
+ return new ErrorTip(500, "不能重复添加城市");
}
+ }else if(!systemPriceCity.getId().equals(one.getId())){
+ return new ErrorTip(500, "不能重复添加城市");
}
- }).start();
+ }else if(!systemPriceCity.getId().equals(one.getId())){
+ return new ErrorTip(500, "不能重复添加城市");
+ }
+ systemPriceCityService.updateById(systemPriceCity);
+ //删除历史数据
+ tSystemPriceService.delete(new EntityWrapper<TSystemPrice>().eq("systemPriceCityId", systemPriceCity.getId()));
+ //解析专车的价格配置
+ JSONArray jsonArray = JSON.parseArray(zcPrice);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ TSystemPrice tSystemPrice = jsonArray.getObject(i, TSystemPrice.class);
+ tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+ tSystemPrice.setType(1);
+ tSystemPrice.setState(1);
+ tSystemPriceService.insert(tSystemPrice);
+ }
+ //解析出出租车价格设置
+ TSystemPrice tSystemPrice = new TSystemPrice();
+ tSystemPrice.setContent(czcPrice);
+ tSystemPrice.setSystemPriceCityId(systemPriceCity.getId());
+ tSystemPrice.setType(2);
+ tSystemPrice.setState(1);
+ tSystemPriceService.insert(tSystemPrice);
return SUCCESS_TIP;
}
@@ -265,16 +423,10 @@
*/
@RequestMapping(value = "/opt")
@ResponseBody
- public Object opt(Integer optType,Integer tSystemPriceId) {
- TSystemPrice systemPrice = new TSystemPrice();
- if (1 == optType){ //冻结
- systemPrice.setState(2);
- }else if (2 == optType){ //解冻
- systemPrice.setState(1);
- }else if (3 == optType){ //删除
- systemPrice.setState(3);
- }
- tSystemPriceService.update(systemPrice,new EntityWrapper<TSystemPrice>().eq("id",tSystemPriceId));
+ public Object opt(Integer id) {
+ SystemPriceCity systemPriceCity = systemPriceCityService.selectById(id);
+ systemPriceCity.setFlag(3);
+ systemPriceCityService.updateById(systemPriceCity);
return SUCCESS_TIP;
}
@@ -293,7 +445,6 @@
one = new TSystemPrice();
one.setState(1);
one.setType(5);
- one.setCompanyId(shiroExtUtil.getUser().getObjectId());
one.setContent(json1);
tSystemPriceService.insert(one);
}
@@ -306,7 +457,6 @@
two = new TSystemPrice();
two.setState(1);
two.setType(4);
- two.setCompanyId(shiroExtUtil.getUser().getObjectId());
two.setContent(json2);
tSystemPriceService.insert(two);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java
new file mode 100644
index 0000000..0b7502f
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:24
+ */
+public interface SystemPriceCityMapper extends BaseMapper<SystemPriceCity> {
+
+ /**
+ * 获取列表数据
+ * @param page
+ * @param name
+ * @param start
+ * @param end
+ * @return
+ */
+ List<Map<String, Object>> queryList(Page<Map<String, Object>> page, @Param("name") String name,
+ @Param("start") String start, @Param("end") String end);
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml
new file mode 100644
index 0000000..d5ca0d1
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml
@@ -0,0 +1,17 @@
+<?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.SystemPriceCityMapper">
+
+
+ <select id="queryList" resultType="java.util.Map">
+ select * from t_system_price_city where flag != 3
+ <if test="null != name and '' != name">
+ and (areaName like concat('%',#{name},'%') or cityName like concat('%',#{name},'%') or provinceName like
+ concat('%',#{name},'%'))
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(insertTime,'%Y-%m-%d') between #{start} and #{end}
+ </if>
+ order by insertTime desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java
new file mode 100644
index 0000000..a11c39e
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BaseBean.java
@@ -0,0 +1,107 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+public class BaseBean {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 1：正常，2：停用，3：删除
+ */
+ @TableField("flag")
+ private Integer flag;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 添加人员
+ */
+ @TableField("insertUser")
+ private Integer insertUser;
+ /**
+ * 修改时间
+ */
+ @TableField("updateTime")
+ private Date updateTime;
+ /**
+ * 修改人员
+ */
+ @TableField("updateUser")
+ private Integer updateUser;
+
+ public BaseBean() {
+ Date date = new Date();
+ this.flag = 1;
+ this.insertTime = date;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Integer flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ public String toString() {
+ return "BaseBean{" +
+ "id=" + id +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ '}';
+ }
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java
index bdf8986..3e08f99 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java
@@ -27,4 +27,9 @@
//用户是否显示(1=是，2=否)
@TableField("userShow")
private Integer userShow;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java
index 4997d72..5531f3b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SpellOrderRule.java
@@ -21,6 +21,11 @@
//公司id
@TableField("companyId")
private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
//规则
@TableField("content")
private String content;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java
new file mode 100644
index 0000000..a1abb22
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java
@@ -0,0 +1,44 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:16
+ */
+@Data
+@TableName("t_system_price_city")
+public class SystemPriceCity extends BaseBean {
+ /**
+ * 省编号
+ */
+ @TableField("areaCode")
+ private String areaCode;
+ /**
+ * 省名称
+ */
+ @TableField("areaName")
+ private String areaName;
+ /**
+ * 市编号
+ */
+ @TableField("cityCode")
+ private String cityCode;
+ /**
+ * 市名称
+ */
+ @TableField("cityName")
+ private String cityName;
+ /**
+ * 区县编号
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 区县名称
+ */
+ @TableField("provinceName")
+ private String provinceName;
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverPayDays.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverPayDays.java
index e6e6771..bc87b6c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverPayDays.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverPayDays.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
import java.util.Date;
@@ -18,66 +19,66 @@
*/
@TableName("t_driver_pay_days")
public class TDriverPayDays extends Model<TDriverPayDays> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 公司id
- */
- @TableField("company_id")
- private Integer companyId;
- /**
- * 天数
- */
- private Integer day;
- @TableField("updateTime")
- private Date updateTime;
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- 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 getDay() {
- return day;
- }
-
- public void setDay(Integer day) {
- this.day = day;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TDriverPayDays{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", day=" + day +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 公司id
+ */
+ @TableField("company_id")
+ private Integer companyId;
+ /**
+ * 天数
+ */
+ private Integer day;
+ @TableField("updateTime")
+ private Date updateTime;
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ 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 getDay() {
+ return day;
+ }
+
+ public void setDay(Integer day) {
+ this.day = day;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TDriverPayDays{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", day=" + day +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java
index 2a7786f..8212bf5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.system.model;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -14,81 +16,94 @@
*/
@TableName("t_phone")
public class TPhone extends Model<TPhone> {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- /**
- * 数据类型（1：报警电话，2：客服电话）
- */
- private Integer type;
- /**
- * 是否是平台（1=是，2=否）
- */
- private Integer platform;
- /**
- * 电话号码
- */
- private String phone;
- /**
- * 企业id
- */
- private Integer companyId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getPlatform() {
- return platform;
- }
-
- public void setPlatform(Integer platform) {
- this.platform = platform;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TPhone{" +
- "id=" + id +
- ", type=" + type +
- ", platform=" + platform +
- ", phone=" + phone +
- ", companyId=" + companyId +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+ /**
+ * 数据类型（1：报警电话，2：客服电话）
+ */
+ private Integer type;
+ /**
+ * 是否是平台（1=是，2=否）
+ */
+ private Integer platform;
+ /**
+ * 电话号码
+ */
+ private String phone;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getPlatform() {
+ return platform;
+ }
+
+ public void setPlatform(Integer platform) {
+ this.platform = platform;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TPhone{" +
+ "id=" + id +
+ ", type=" + type +
+ ", platform=" + platform +
+ ", phone=" + phone +
+ ", companyId=" + companyId +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
index 26663ee..1293dea 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -57,7 +57,10 @@
* 添加时间
*/
private Date insertTime;
-
+
+
+ @TableField(exist = false)
+ private String object;
public String getPrice() {
return price;
}
@@ -113,7 +116,31 @@
public void setInsertTime(Date insertTime) {
this.insertTime = insertTime;
}
-
+
+ public Integer getPriceType() {
+ return priceType;
+ }
+
+ public void setPriceType(Integer priceType) {
+ this.priceType = priceType;
+ }
+
+ public String getIsCheck() {
+ return isCheck;
+ }
+
+ public void setIsCheck(String isCheck) {
+ this.isCheck = isCheck;
+ }
+
+ public String getObject() {
+ return object;
+ }
+
+ public void setObject(String object) {
+ this.object = object;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
index 3f49e52..82ee1aa 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
@@ -1,10 +1,14 @@
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;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -17,98 +21,111 @@
*/
@TableName("t_sys_cancle_order")
public class TSysCancleOrder extends Model<TSysCancleOrder> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 时间(分钟)
- */
- private Integer minuteNum;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- * 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;
- }
-
- @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 +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 时间(分钟)
+ */
+ private Integer minuteNum;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 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;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @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 +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java
index 4da14ac..7696a50 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,72 +18,85 @@
*/
@TableName("t_sys_face_distinguish")
public class TSysFaceDistinguish extends Model<TSysFaceDistinguish> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 是否打开(1=是，2=否)
- */
- private Integer isOpen;
- /**
- * 间隔分钟数
- */
- private Integer minuteNum;
-
-
- 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 getIsOpen() {
- return isOpen;
- }
-
- public void setIsOpen(Integer isOpen) {
- this.isOpen = isOpen;
- }
-
- public Integer getMinuteNum() {
- return minuteNum;
- }
-
- public void setMinuteNum(Integer minuteNum) {
- this.minuteNum = minuteNum;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysFaceDistinguish{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", isOpen=" + isOpen +
- ", minuteNum=" + minuteNum +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 是否打开(1=是，2=否)
+ */
+ private Integer isOpen;
+ /**
+ * 间隔分钟数
+ */
+ private Integer minuteNum;
+
+
+ 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 getIsOpen() {
+ return isOpen;
+ }
+
+ public void setIsOpen(Integer isOpen) {
+ this.isOpen = isOpen;
+ }
+
+ public Integer getMinuteNum() {
+ return minuteNum;
+ }
+
+ public void setMinuteNum(Integer minuteNum) {
+ this.minuteNum = minuteNum;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysFaceDistinguish{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", isOpen=" + isOpen +
+ ", minuteNum=" + minuteNum +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java
index 58f3298..d131071 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,59 +18,72 @@
*/
@TableName("t_sys_integral")
public class TSysIntegral extends Model<TSysIntegral> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 积分
- */
- private Integer integral;
-
-
- 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 getIntegral() {
- return integral;
- }
-
- public void setIntegral(Integer integral) {
- this.integral = integral;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysIntegral{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", integral=" + integral +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 积分
+ */
+ private Integer integral;
+
+
+ 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 getIntegral() {
+ return integral;
+ }
+
+ public void setIntegral(Integer integral) {
+ this.integral = integral;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysIntegral{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", integral=" + integral +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
index a32f498..88c413b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,111 +18,124 @@
*/
@TableName("t_sys_push_order")
public class TSysPushOrder extends Model<TSysPushOrder> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 推单距离(公里)
- */
- private Double pushDistance;
- /**
- * 推单时间(秒)
- */
- private Integer pushTime;
- /**
- * 推单占所有司机百分比
- */
- private Double driverProportion;
- /**
- * 1=第一轮，2=第二轮，3=第三轮
- */
- private Integer type;
- /**
- * 1=快车，2=出租车
- */
- private Integer pushType;
-
-
- 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 Double getPushDistance() {
- return pushDistance;
- }
-
- public void setPushDistance(Double pushDistance) {
- this.pushDistance = pushDistance;
- }
-
- public Integer getPushTime() {
- return pushTime;
- }
-
- public void setPushTime(Integer pushTime) {
- this.pushTime = pushTime;
- }
-
- public Double getDriverProportion() {
- return driverProportion;
- }
-
- public void setDriverProportion(Double driverProportion) {
- this.driverProportion = driverProportion;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getPushType() {
- return pushType;
- }
-
- public void setPushType(Integer pushType) {
- this.pushType = pushType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysPushOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", pushDistance=" + pushDistance +
- ", pushTime=" + pushTime +
- ", driverProportion=" + driverProportion +
- ", type=" + type +
- ", pushType=" + pushType +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 推单距离(公里)
+ */
+ private Double pushDistance;
+ /**
+ * 推单时间(秒)
+ */
+ private Integer pushTime;
+ /**
+ * 推单占所有司机百分比
+ */
+ private Double driverProportion;
+ /**
+ * 1=第一轮，2=第二轮，3=第三轮
+ */
+ private Integer type;
+ /**
+ * 1=快车，2=出租车
+ */
+ private Integer pushType;
+
+
+ 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 getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ public Double getPushDistance() {
+ return pushDistance;
+ }
+
+ public void setPushDistance(Double pushDistance) {
+ this.pushDistance = pushDistance;
+ }
+
+ public Integer getPushTime() {
+ return pushTime;
+ }
+
+ public void setPushTime(Integer pushTime) {
+ this.pushTime = pushTime;
+ }
+
+ public Double getDriverProportion() {
+ return driverProportion;
+ }
+
+ public void setDriverProportion(Double driverProportion) {
+ this.driverProportion = driverProportion;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getPushType() {
+ return pushType;
+ }
+
+ public void setPushType(Integer pushType) {
+ this.pushType = pushType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysPushOrder{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", pushDistance=" + pushDistance +
+ ", pushTime=" + pushTime +
+ ", driverProportion=" + driverProportion +
+ ", type=" + type +
+ ", pushType=" + pushType +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
index 9caa26a..e6f191a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
@@ -1,10 +1,14 @@
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;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -17,82 +21,95 @@
*/
@TableName("t_sys_reformist")
public class TSysReformist extends Model<TSysReformist> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- * 快车改派 1=否 2=是
- */
- private Integer isSpecialCar;
- /**
- * 出租车改派 1=否 2=是
- */
- private Integer isTaxiCar;
-
- public Integer getIsSpecialCar() {
- return isSpecialCar;
- }
-
- public void setIsSpecialCar(Integer isSpecialCar) {
- this.isSpecialCar = isSpecialCar;
- }
-
- public Integer getIsTaxiCar() {
- return isTaxiCar;
- }
-
- public void setIsTaxiCar(Integer isTaxiCar) {
- this.isTaxiCar = isTaxiCar;
- }
-
- 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 BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysReformist{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", money=" + money +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 快车改派 1=否 2=是
+ */
+ private Integer isSpecialCar;
+ /**
+ * 出租车改派 1=否 2=是
+ */
+ private Integer isTaxiCar;
+
+ public Integer getIsSpecialCar() {
+ return isSpecialCar;
+ }
+
+ public void setIsSpecialCar(Integer isSpecialCar) {
+ this.isSpecialCar = isSpecialCar;
+ }
+
+ public Integer getIsTaxiCar() {
+ return isTaxiCar;
+ }
+
+ public void setIsTaxiCar(Integer isTaxiCar) {
+ this.isTaxiCar = isTaxiCar;
+ }
+
+ 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 BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysReformist{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", money=" + money +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
index 044d934..dc75989 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysTimeoutMoney.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,56 +18,69 @@
*/
@TableName("t_sys_timeout_money")
public class TSysTimeoutMoney extends Model<TSysTimeoutMoney> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 超时分钟数
- */
- private Integer timeOut;
- /**
- * 扣除费用百分比
- */
- private Double deductMoney;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getTimeOut() {
- return timeOut;
- }
-
- public void setTimeOut(Integer timeOut) {
- this.timeOut = timeOut;
- }
-
- public Double getDeductMoney() {
- return deductMoney;
- }
-
- public void setDeductMoney(Double deductMoney) {
- this.deductMoney = deductMoney;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysTimeoutMoney{" +
- "id=" + id +
- ", timeOut=" + timeOut +
- ", deductMoney=" + deductMoney +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 超时分钟数
+ */
+ private Integer timeOut;
+ /**
+ * 扣除费用百分比
+ */
+ private Double deductMoney;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getTimeOut() {
+ return timeOut;
+ }
+
+ public void setTimeOut(Integer timeOut) {
+ this.timeOut = timeOut;
+ }
+
+ public Double getDeductMoney() {
+ return deductMoney;
+ }
+
+ public void setDeductMoney(Double deductMoney) {
+ this.deductMoney = deductMoney;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysTimeoutMoney{" +
+ "id=" + id +
+ ", timeOut=" + timeOut +
+ ", deductMoney=" + deductMoney +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java
index 3c31cb6..9a70c65 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysWithdrawalPoundage.java
@@ -1,9 +1,11 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
/**
@@ -16,43 +18,44 @@
*/
@TableName("t_sys_withdrawal_poundage")
public class TSysWithdrawalPoundage extends Model<TSysWithdrawalPoundage> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 百分比
- */
- private Double percentage;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Double getPercentage() {
- return percentage;
- }
-
- public void setPercentage(Double percentage) {
- this.percentage = percentage;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysWithdrawalPoundage{" +
- "id=" + id +
- ", percentage=" + percentage +
- "}";
- }
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 百分比
+ */
+ private Double percentage;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Double getPercentage() {
+ return percentage;
+ }
+
+ public void setPercentage(Double percentage) {
+ this.percentage = percentage;
+ }
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysWithdrawalPoundage{" +
+ "id=" + id +
+ ", percentage=" + percentage +
+ "}";
+ }
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
index 1ec7af7..a76621b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
@@ -30,9 +30,10 @@
*/
private Integer type;
/**
- * 企业id
+ * 价格城市id
*/
- private Integer companyId;
+ @TableField("systemPriceCityId")
+ private Integer systemPriceCityId;
/**
* 服务车型id
*/
@@ -138,18 +139,6 @@
public void setType(Integer type) {
this.type = type;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
}
public void setServerCarModelId(Integer serverCarModelId) {
@@ -275,8 +264,19 @@
public void setIsOpenPrice(Integer isOpenPrice) {
this.isOpenPrice = isOpenPrice;
}
-
-
+
+ public Integer getSystemPriceCityId() {
+ return systemPriceCityId;
+ }
+
+ public void setSystemPriceCityId(Integer systemPriceCityId) {
+ this.systemPriceCityId = systemPriceCityId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -287,7 +287,6 @@
return "TSystemPrice{" +
"id=" + id +
", type=" + type +
- ", companyId=" + companyId +
", serverCarModelId=" + serverCarModelId +
", content='" + content + '\'' +
", fareTypeNote1='" + fareTypeNote1 + '\'' +
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java
new file mode 100644
index 0000000..6d1b544
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:24
+ */
+public interface ISystemPriceCityService extends IService<SystemPriceCity> {
+
+ /**
+ * 获取价格列表
+ * @param page
+ * @param name
+ * @param time
+ * @return
+ */
+ List<Map<String, Object>> queryList(Page<Map<String, Object>> page, String name, String time);
+
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java
new file mode 100644
index 0000000..b5386b1
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.SystemPriceCityMapper;
+import com.stylefeng.guns.modular.system.model.SystemPriceCity;
+import com.stylefeng.guns.modular.system.service.ISystemPriceCityService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/7/26 9:25
+ */
+@Service
+public class SystemPriceCityServiceImpl extends ServiceImpl<SystemPriceCityMapper, SystemPriceCity> implements ISystemPriceCityService {
+
+ /**
+ * 获取列表数据
+ * @param page
+ * @param name
+ * @param time
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> queryList(Page<Map<String, Object>> page, String name, String time) {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split("-")[0];
+ end = time.split("-")[0];
+ }
+ return this.baseMapper.queryList(page, name, start, end);
+ }
+}
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
index 48eea26..6b8b6ae 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
@@ -30,6 +30,9 @@
@if(shiro.hasPermission("/tOpenCity/delete")){
<#button name="删除" icon="fa-remove" clickFun="TOpenCity.delete()" space="true"/>
@}
+ @if(shiro.hasPermission("/tOpenCity/systemSet")){
+ <#button name="设置基础配置" icon="fa-plus" clickFun="TOpenCity.systemSet()" space="true"/>
+ @}
</div>
<#table id="TOpenCityTable"/>
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html
new file mode 100644
index 0000000..969c86e
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tSysReformist.html
@@ -0,0 +1,1053 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+ .lab{
+ display: block;
+ width: 150px;
+ height: 45px;
+ text-align: center;
+ line-height: 45px;
+ cursor: pointer;
+ font-size: 16px;
+ background-color: #F8F8F8;
+ margin: 0;
+ }
+ .lab:hover{
+ background-color: #F3F4F5;
+ }
+ .checked{
+ background-color: #FFF !important;
+ border-left: 10px solid #077CCB;
+ }
+ table{
+ width: 100%;
+ }
+ tr{
+ height: 40px;
+ }
+ th, td{
+ text-align: center;
+ border: 1px solid #F4F4F4;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <input type="hidden" id="openCityId" value="${openCityId}">
+ <div class="col-sm-11">
+ <div class="ibox-title">
+ <h3>系统设置:</h3>
+ </div>
+ <div>
+ <div style="float: left;">
+ <label class="lab checked" onclick="checkedLable(this)" tag="pushOrderSettings">推单设置</label>
+<!-- <label class="lab" onclick="checkedLable(this)" tag="driverPayDays">司机分账账期设置</label>-->
+ <label class="lab" onclick="checkedLable(this)" tag="cancelOrderSettings">取消订单设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="cancelTheReservationOrderSetting">预约单取消设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="spellOrderSetting">拼单派单设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="timeoutDeductionSettings">超时扣款设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="reassigningSet">改派设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="faceRecognitionSettings">人脸识别设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="integralSet">积分设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="withdrawalFeeSetting">提现手续费设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="phoneSettings">电话设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="holidayServiceFeeSetting">节假日服务费设置</label>
+ <label class="lab" onclick="checkedLable(this)" tag="95128TheOnCall">95128电召</label>
+ <label class="lab" onclick="checkedLable(this)" tag="moduleManagement">模块管理</label>
+ </div>
+ <div style="float: left;width: 1200px;margin-left: 50px;">
+ <div class="pushOrderSettings">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">快车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="zc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc2" id="zc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc3" id="zc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc4" id="zc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc5" id="zc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc6" id="zc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="zc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc8" id="zc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc9" id="zc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">出租车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc1" id="czc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc2" id="czc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc3" id="czc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc4" id="czc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc5" id="czc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc6" id="czc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc7" id="czc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc8" id="czc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc9" id="czc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('pushOrderSettings')"/>
+ </div>
+ </div>
+ </div>
+ <div class="driverPayDays" hidden>
+ <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(driverDay)){
+ value="${driverDay}"
+ @}else{
+ value=""
+ @}
+ name="driverDay" id="driverDay" class="form-control newWidth" />
+ <br/>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('driverPayDays')"/>
+ </div>
+ </div>
+ </div>
+ <div class="cancelOrderSettings" hidden>
+ <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(ptCancel1)){
+ value="${ptCancel1.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel1" id="ptCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel1)){
+ value="${ptCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <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/>
+ <br/>
+ 跨城出行取消规则：跨城订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(ptCancel3)){
+ value="${ptCancel3.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel5" id="ptCancel5" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel3)){
+ value="${ptCancel3.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel6" id="ptCancel6" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('cancelOrderSettings')"/>
+ </div>
+ </div>
+ </div>
+ <div class="cancelTheReservationOrderSetting" hidden>
+ <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}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel1" id="yyCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(yyCancel1)){
+ value="${yyCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <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 class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('cancelTheReservationOrderSetting')"/>
+ </div>
+ </div>
+ </div>
+ <div class="spellOrderSetting" hidden>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">实时拼单：</label>
+ <div class="col-sm-10">
+ 满足用户起点位置 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num1}"
+ @}else{
+ value=""
+ @}
+ id="pdpd1" class="form-control newWidth" /> 公里范围内，
+ 且满足终点位置 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num2}"
+ @}else{
+ value=""
+ @}
+ id="pdpd2" class="form-control newWidth" /> 公里范围内的拼车用户匹配订单
+ <br>
+ <br>
+ 满足司机当前位置 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num3}"
+ @}else{
+ value=""
+ @}
+ id="pdpd3" class="form-control newWidth" /> 公里范围内，
+ 且终点满足当前服务用户终点位置的 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num4}"
+ @}else{
+ value=""
+ @}
+ id="pdpd4" class="form-control newWidth" /> 公里范围内的拼车用户匹配订单
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">预约拼车：</label>
+ <div class="col-sm-10">
+ 用户的出发时间前 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num5}"
+ @}else{
+ value=""
+ @}
+ id="pdpd5" class="form-control newWidth" /> 分钟，
+ 后 <input type="text"
+ @if(isNotEmpty(spellOrderRule)){
+ value="${spellOrderRule.num6}"
+ @}else{
+ value=""
+ @}
+ id="pdpd6" class="form-control newWidth" /> 分钟的订单，可匹配一起
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('spellOrderSetting')"/>
+ </div>
+ </div>
+ </div>
+ <div class="timeoutDeductionSettings" hidden>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">超过：</label>
+ <input type="text"
+ @if(isNotEmpty(tSysTimeoutMoney)){
+ value="${tSysTimeoutMoney.timeOut}"
+ @}else{
+ value=""
+ @}
+ id="timeOut" class="form-control newWidth" /> 分钟，
+ 小件物流超时扣除司机金额 <input type="text"
+ @if(isNotEmpty(tSysTimeoutMoney)){
+ value="${tSysTimeoutMoney.deductMoney}"
+ @}else{
+ value=""
+ @}
+ id="deductMoney" class="form-control newWidth" /> %
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('timeoutDeductionSettings')"/>
+ </div>
+ </div>
+ </div>
+ <div class="reassigningSet" hidden>
+ <div class="col-sm-3">
+ 改派费用为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(reformist)){
+ value="${reformist.money}"
+ @}else{
+ value=""
+ @}
+ name="one" id="one" class="form-control newWidth" /> 元；<br/>
+ </div>
+ <div class="col-sm-3">
+ <label class="col-sm-5 control-label">快车改派：</label>
+ <div class="col-sm-7">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch" id="isSpecialCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isSpecialCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <label class="col-sm-5 control-label">出租车改派：</label>
+ <div class="col-sm-7">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('reassigningSet')"/>
+ </div>
+ </div>
+ </div>
+ <div class="faceRecognitionSettings" hidden>
+ <div class="form-group" style="height: 70px;">
+ <label class="col-sm-2 control-label">人脸识别：</label>
+ <div class="col-sm-10">
+ <div class="radio radio-danger">
+ <input type="radio" name="three" id="three1" value="2"
+ ${isNotEmpty(faceDistinguish) && 2 == faceDistinguish.isOpen ? 'checked=checked' : ''}
+ onclick="threeClick(2)">
+ <label for="three1">
+ 关闭
+ </label>
+ </div>
+ <div class="radio radio-danger">
+ <input type="radio" name="three" id="three2" value="1"
+ ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen ? 'checked=checked' : ''}
+ onclick="threeClick(1)">
+ <label for="three2">
+ 打开
+ <div id="openDiv" style="position: relative;top: -26px;margin-left: 50px;display: none;">
+ <span style="margin-left: 20px;">上班中每隔</span>
+ <input type="text" oninput="checkIsInt(this)" class="form-control newWidth"
+ ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen ? 'value='+faceDistinguish.minuteNum : ''}
+ id="openValue" name="openValue">
+ <span>分钟，进行一次人脸识别；</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('faceRecognitionSettings')"/>
+ </div>
+ </div>
+ </div>
+ <div class="integralSet" hidden>
+ <div class="form-group">
+ <div class="col-sm-10">
+ 消费一元积 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(integral)){
+ value="${integral.integral}"
+ @}else{
+ value=""
+ @}
+ name="two" id="two" class="form-control newWidth" /> 积分；<br/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('integralSet')"/>
+ </div>
+ </div>
+ </div>
+ <div class="withdrawalFeeSetting" hidden>
+ <div class="form-group" style="border: 0">
+ <label class="col-sm-2 control-label">提现手续费：</label>
+ <input type="text"
+ @if(isNotEmpty(tSysWithdrawalPoundage)){
+ value="${tSysWithdrawalPoundage.percentage}"
+ @}else{
+ value=""
+ @}
+ id="percentage" class="form-control newWidth" /> %
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('withdrawalFeeSetting')"/>
+ </div>
+ </div>
+ </div>
+ <div class="phoneSettings" hidden>
+ <div class="form-group">
+ <div class="col-sm-10">
+ 报警电话： <input type="text"
+ @if(isNotEmpty(phone1)){
+ value="${phone1.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone1" id="phone1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 客服电话： <input type="text"
+ @if(isNotEmpty(phone2)){
+ value="${phone2.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone2" id="phone2" class="form-control newWidth" />
+ <br/>
+ <!--
+ <br/>
+ 包车调度电话： <input type="text"
+ @if(isNotEmpty(phone3)){
+ value="${phone3.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone3" id="phone3" class="form-control newWidth" />
+ <br/>
+ -->
+ <br/>
+ 招聘电话： <input type="text"
+ @if(isNotEmpty(phone5)){
+ value="${phone5.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone3" id="phone5" class="form-control newWidth" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('phoneSettings')"/>
+ </div>
+ </div>
+ </div>
+ <div class="holidayServiceFeeSetting" hidden>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">节假日服务费：</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="holidayFee"
+ @if(isNotEmpty(holidayFee)){
+ value="${holidayFee}"
+ @}else{
+ value=""
+ @}
+ />
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('holidayServiceFeeSetting')"/>
+ </div>
+ </div>
+ </div>
+ <div class="95128TheOnCall" hidden>
+ 95128电召电话： <input type="text"
+ @if(isNotEmpty(phone4)){
+ value="${phone4.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone4" id="phone4" class="form-control newWidth" />
+ <br/>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('95128TheOnCall')"/>
+ </div>
+ </div>
+ </div>
+ <div class="moduleManagement" hidden>
+ <table>
+ <thead>
+ <tr><th>序号</th><th>模块名</th><th>用户端是否显示</th><th>司机端是否显示</th></tr>
+ </thead>
+ <tbody>
+ <tr><td>1</td><td>司机招聘</td><td><input type="checkbox" class="js-switch1-1" id="sjzp1" ${2 == showModulars.sjzp1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch1-2" id="sjzp2" ${2 == showModulars.sjzp2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>2</td><td>租车</td><td><input type="checkbox" class="js-switch2-1" id="zuc1" ${2 == showModulars.zuc1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch2-2" id="zuc2" ${2 == showModulars.zuc2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>3</td><td>买车</td><td><input type="checkbox" class="js-switch3-1" id="mc1" ${2 == showModulars.mc1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch3-2" id="mc2" ${2 == showModulars.mc2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>4</td><td>出租个人车辆</td><td><input type="checkbox" class="js-switch4-1" id="czgrcl1" ${2 == showModulars.czgrcl1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch4-2" id="czgrcl2" ${2 == showModulars.czgrcl2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>5</td><td>卖车</td><td><input type="checkbox" class="js-switch5-1" id="mac1" ${2 == showModulars.mac1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch5-2" id="mac2" ${2 == showModulars.mac2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>6</td><td>商家中心</td><td><input type="checkbox" class="js-switch6-1" id="sjzx1" ${2 == showModulars.sjzx1 ? '' : 'checked=checked'}/></td><td><input type="checkbox" class="js-switch6-2" id="sjzx2" ${2 == showModulars.sjzx2 ? '' : 'checked=checked'}/></td></tr>
+ <tr><td>7</td><td>打车卡</td><td><input type="checkbox" class="js-switch7-1" id="dck1" ${2 == showModulars.dck1 ? '' : 'checked=checked'}/></td><td> - </td></tr>
+ </tbody>
+ </table>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp('moduleManagement')"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script type="text/javascript">
+ $(function() {
+ var elem = document.querySelector(".js-switch");
+ var init = new Switchery(elem);
+ var elem1 = document.querySelector(".js-switch1");
+ var init1 = new Switchery(elem1);
+ var elem1_1 = document.querySelector(".js-switch1-1");
+ var init1 = new Switchery(elem1_1);
+ var elem1_2 = document.querySelector(".js-switch1-2");
+ var init1 = new Switchery(elem1_2);
+ var elem2_1 = document.querySelector(".js-switch2-1");
+ var init1 = new Switchery(elem2_1);
+ var elem2_2 = document.querySelector(".js-switch2-2");
+ var init1 = new Switchery(elem2_2);
+ var elem3_1 = document.querySelector(".js-switch3-1");
+ var init1 = new Switchery(elem3_1);
+ var elem3_2 = document.querySelector(".js-switch3-2");
+ var init1 = new Switchery(elem3_2);
+ var elem4_1 = document.querySelector(".js-switch4-1");
+ var init1 = new Switchery(elem4_1);
+ var elem4_2 = document.querySelector(".js-switch4-2");
+ var init1 = new Switchery(elem4_2);
+ var elem5_1 = document.querySelector(".js-switch5-1");
+ var init1 = new Switchery(elem5_1);
+ var elem5_2 = document.querySelector(".js-switch5-2");
+ var init1 = new Switchery(elem5_2);
+ var elem6_1 = document.querySelector(".js-switch6-1");
+ var init1 = new Switchery(elem6_1);
+ var elem6_2 = document.querySelector(".js-switch6-2");
+ var init1 = new Switchery(elem6_2);
+ var elem7_1 = document.querySelector(".js-switch7-1");
+ var init1 = new Switchery(elem7_1);
+ var elem7_2 = document.querySelector(".js-switch7-2");
+ var init1 = new Switchery(elem7_2);
+
+ var three = $("input[name='three']:checked").val();
+ if (three == "" || three == null || three == undefined){
+ $("#three1").attr("checked","checked");
+ }
+ threeClick($("input[name='three']:checked").val());
+ });
+
+ //人脸识别打开按钮被点击
+ function threeClick(obj) {
+ if (obj == 1){
+ $("#openDiv").show();
+ } else {
+ $("#openDiv").hide();
+ }
+ }
+
+ var regDouble = /^[0-9]\d*(\.\d*[0-9])?$/;
+ function checkIsDouble(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("小数/正整数格式");
+ }
+ }
+
+ //验证是否输入正整数
+ var regInt = /^[0-9]\d*$/;
+ function checkIsInt(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("正整数格式");
+ }
+ }
+
+ function checkedLable(e) {
+ $(e).attr('class', 'lab checked');
+ let tag = $(e).attr('tag');
+ $('.' + tag).show();
+ $(e).siblings().each(function (i, el) {
+ $(el).attr('class', 'lab');
+ let tag1 = $(el).attr('tag');
+ $('.' + tag1).hide();
+ })
+ }
+
+
+
+ /**
+ * 提交操作
+ */
+ function setUp(type) {
+ var openCityId = $('#openCityId').val();
+ var one = $("#one").val().trim();
+ var two = $("#two").val().trim();
+ var three = $("input[name='three']:checked").val();
+ var openValue = $("#openValue").val();
+ var percentage = $("#percentage").val();
+ var timeOut = $("#timeOut").val();
+ var deductMoney = $("#deductMoney").val();
+
+ var isSpecialCar = $("#isSpecialCar").is(":checked");
+ if (isSpecialCar){
+ isSpecialCar = 2;
+ } else {
+ isSpecialCar = 1;
+ }
+ var isTaxiCar = $("#isTaxiCar").is(":checked");
+ if (isTaxiCar){
+ isTaxiCar = 2;
+ } else {
+ isTaxiCar = 1;
+ }
+ if(type == 'faceRecognitionSettings'){
+ if (1 == three){
+ if ("" == openValue || null == openValue || undefined == openValue){
+ Feng.info("人脸识别分钟数不能为空!");
+ return;
+ }else if (!regInt.test(openValue)) {
+ Feng.info("人脸识别分钟数格式不正确!");
+ return;
+ }
+ }
+ }
+
+ var zc1 = null == $("#zc1").val() ? "0" : $("#zc1").val().trim();
+ var zc2 = null == $("#zc2").val() ? "0" : $("#zc2").val().trim();
+ var zc3 = null == $("#zc3").val() ? "0" : $("#zc3").val().trim();
+ var zc4 = null == $("#zc4").val() ? "0" : $("#zc4").val().trim();
+ var zc5 = null == $("#zc5").val() ? "0" : $("#zc5").val().trim();
+ var zc6 = null == $("#zc6").val() ? "0" : $("#zc6").val().trim();
+ var zc7 = null == $("#zc7").val() ? "0" : $("#zc7").val().trim();
+ var zc8 = null == $("#zc8").val() ? "0" : $("#zc8").val().trim();
+ var zc9 = null == $("#zc9").val() ? "0" : $("#zc9").val().trim();
+
+ var czc1 = null == $("#czc1").val() ? "0" : $("#czc1").val().trim();
+ var czc2 = null == $("#czc2").val() ? "0" : $("#czc2").val().trim();
+ var czc3 = null == $("#czc3").val() ? "0" : $("#czc3").val().trim();
+ var czc4 = null == $("#czc4").val() ? "0" : $("#czc4").val().trim();
+ var czc5 = null == $("#czc5").val() ? "0" : $("#czc5").val().trim();
+ var czc6 = null == $("#czc6").val() ? "0" : $("#czc6").val().trim();
+ var czc7 = null == $("#czc7").val() ? "0" : $("#czc7").val().trim();
+ var czc8 = null == $("#czc8").val() ? "0" : $("#czc8").val().trim();
+ var czc9 = null == $("#czc9").val() ? "0" : $("#czc9").val().trim();
+ if(type == 'pushOrderSettings'){
+ if("" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
+ || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ if(!regDouble.test(zc1) || !regInt.test(zc2) || !regDouble.test(zc3)
+ || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
+ || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
+
+ || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
+ || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
+ || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ }
+
+ var ptCancel1 = null == $("#ptCancel1").val() ? "0" : $("#ptCancel1").val().trim();
+ var ptCancel2 = null == $("#ptCancel2").val() ? "0" : $("#ptCancel2").val().trim();
+ var ptCancel3 = null == $("#ptCancel3").val() ? "0" : $("#ptCancel3").val().trim();
+ var ptCancel4 = null == $("#ptCancel4").val() ? "0" : $("#ptCancel4").val().trim();
+ var ptCancel5 = null == $("#ptCancel5").val() ? "0" : $("#ptCancel5").val().trim();
+ var ptCancel6 = null == $("#ptCancel6").val() ? "0" : $("#ptCancel6").val().trim();
+ if(type == 'cancelOrderSettings'){
+ if("" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ if(!regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) || !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ }
+
+ var yyCancel1 = null == $("#yyCancel1").val() ? "0" : $("#yyCancel1").val().trim();
+ var yyCancel2 = null == $("#yyCancel2").val() ? "0" : $("#yyCancel2").val().trim();
+ var yyCancel3 = null == $("#yyCancel3").val() ? "0" : $("#yyCancel3").val().trim();
+ var yyCancel4 = null == $("#yyCancel4").val() ? "0" : $("#yyCancel4").val().trim();
+ if(type == 'cancelTheReservationOrderSetting'){
+ if("" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ if(!regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ }
+ var pdpd1 = null == $("#pdpd1").val() ? "0" : $('#pdpd1').val().trim();
+ var pdpd2 = null == $("#pdpd2").val() ? "0" : $('#pdpd2').val().trim();
+ var pdpd3 = null == $("#pdpd3").val() ? "0" : $('#pdpd3').val().trim();
+ var pdpd4 = null == $("#pdpd4").val() ? "0" : $('#pdpd4').val().trim();
+ var pdpd5 = null == $("#pdpd5").val() ? "0" : $('#pdpd5').val().trim();
+ var pdpd6 = null == $("#pdpd6").val() ? "0" : $('#pdpd6').val().trim();
+ if(type == 'spellOrderSetting'){
+ if("" == pdpd1 || "" == pdpd2 || "" == pdpd3 || "" == pdpd4 || "" == pdpd5 || "" == pdpd6){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ if(!regDouble.test(pdpd1) || !regDouble.test(pdpd2) || !regDouble.test(pdpd3) || !regDouble.test(pdpd4) || !regDouble.test(pdpd5) || !regDouble.test(pdpd6)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ }
+
+ var phone1 = null == $("#phone1").val() ? "0" : $("#phone1").val().trim();
+ var phone2 = null == $("#phone2").val() ? "0" : $("#phone2").val().trim();
+ var phone3 = null == $("#phone3").val() ? "0" : $("#phone3").val().trim();
+ var phone5 = null == $("#phone5").val() ? "0" : $("#phone5").val().trim();
+ if(type == "phoneSettings"){
+ if('' == phone1 || '' == phone2 || '' == phone3 || '' == phone5){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ }
+
+ var phone4 = $("#phone4").val().trim();
+ if(type == "95128TheOnCall"){
+ if('' == phone4){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ }
+
+ var holidayFee = $("#holidayFee").val().trim();
+
+
+ if(type == 'holidayServiceFeeSetting'){
+ if('' == holidayFee){
+ Feng.info("输入框不能为空!");
+ return;
+ }
+ if(!regDouble.test(holidayFee)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ }
+
+ var sjzp1 = $("#sjzp1").is(":checked");
+ if (sjzp1){sjzp1 = 1;} else {sjzp1 = 2;}
+ var sjzp2 = $("#sjzp2").is(":checked");
+ if (sjzp2){sjzp2 = 1;} else {sjzp2 = 2;}
+
+ var zuc1 = $("#zuc1").is(":checked");
+ if (zuc1){zuc1 = 1;} else {zuc1 = 2;}
+ var zuc2 = $("#zuc2").is(":checked");
+ if (zuc2){zuc2 = 1;} else {zuc2 = 2;}
+
+ var mc1 = $("#mc1").is(":checked");
+ if (mc1){mc1 = 1;} else {mc1 = 2;}
+ var mc2 = $("#mc2").is(":checked");
+ if (mc2){mc2 = 1;} else {mc2 = 2;}
+
+ var czgrcl1 = $("#czgrcl1").is(":checked");
+ if (czgrcl1){czgrcl1 = 1;} else {czgrcl1 = 2;}
+ var czgrcl2 = $("#czgrcl2").is(":checked");
+ if (czgrcl2){czgrcl2 = 1;} else {czgrcl2 = 2;}
+
+ var mac1 = $("#mac1").is(":checked");
+ if (mac1){mac1 = 1;} else {mac1 = 2;}
+ var mac2 = $("#mac2").is(":checked");
+ if (mac2){mac2 = 1;} else {mac2 = 2;}
+
+ var sjzx1 = $("#sjzx1").is(":checked");
+ if (sjzx1){sjzx1 = 1;} else {sjzx1 = 2;}
+ var sjzx2 = $("#sjzx2").is(":checked");
+ if (sjzx2){sjzx2 = 1;} else {sjzx2 = 2;}
+
+ var dck1 = $("#dck1").is(":checked");
+ if (dck1){dck1 = 1;} else {dck1 = 2;}
+ var dck2 = $("#dck2").is(":checked");
+ if (dck2){dck2 = 1;} else {dck2 = 2;}
+
+ var driverDays=$("#driverDay").val()
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSysReformist/setUp", function(data){
+ Feng.success("操作成功!");
+ location.reload();
+ },function(data){
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+
+ if(type == 'integralSet'){
+ ajax.set("two", two);
+ }
+
+ if(type == 'driverPayDays'){
+ if(!regInt.test(driverDays)){
+ Feng.info("格式不正确!");
+ return ;
+ }
+ ajax.set("driverDays", driverDays);
+ }
+
+ if(type == 'faceRecognitionSettings'){
+ ajax.set("three", three);
+ if (1 == three){
+ ajax.set("openValue",openValue);
+ } else if (2 == three){
+ ajax.set("openValue",0);
+ }
+ }
+
+ if(type == 'withdrawalFeeSetting'){
+ ajax.set("percentage", percentage);
+ }
+
+ if(type == 'timeoutDeductionSettings'){
+ ajax.set("timeOut", timeOut);
+ ajax.set("deductMoney", deductMoney);
+ }
+
+ if(type == 'reassigningSet'){
+ ajax.set("one", one);
+ ajax.set("isSpecialCar", isSpecialCar);
+ ajax.set("isTaxiCar", isTaxiCar);
+ }
+
+ if(type == 'pushOrderSettings'){
+ ajax.set("zc1", zc1);
+ ajax.set("zc2", zc2);
+ ajax.set("zc3", zc3);
+ ajax.set("zc4", zc4);
+ ajax.set("zc5", zc5);
+ ajax.set("zc6", zc6);
+ ajax.set("zc7", zc7);
+ ajax.set("zc8", zc8);
+ ajax.set("zc9", zc9);
+
+ ajax.set("czc1", czc1);
+ ajax.set("czc2", czc2);
+ ajax.set("czc3", czc3);
+ ajax.set("czc4", czc4);
+ ajax.set("czc5", czc5);
+ ajax.set("czc6", czc6);
+ ajax.set("czc7", czc7);
+ ajax.set("czc8", czc8);
+ ajax.set("czc9", czc9);
+ }
+
+ if(type == 'cancelOrderSettings'){
+ ajax.set("ptCancel1", ptCancel1);
+ ajax.set("ptCancel2", ptCancel2);
+ ajax.set("ptCancel3", ptCancel3);
+ ajax.set("ptCancel4", ptCancel4);
+ ajax.set("ptCancel5", ptCancel5);
+ ajax.set("ptCancel6", ptCancel6);
+ }
+ if(type == 'cancelTheReservationOrderSetting'){
+ ajax.set("yyCancel1", yyCancel1);
+ ajax.set("yyCancel2", yyCancel2);
+ ajax.set("yyCancel3", yyCancel3);
+ ajax.set("yyCancel4", yyCancel4);
+ }
+ if(type == 'spellOrderSetting'){
+ ajax.set("pdpd1", pdpd1);
+ ajax.set("pdpd2", pdpd2);
+ ajax.set("pdpd3", pdpd3);
+ ajax.set("pdpd4", pdpd4);
+ ajax.set("pdpd5", pdpd5);
+ ajax.set("pdpd6", pdpd6);
+ }
+ if(type == "phoneSettings"){
+ ajax.set("phone1", phone1);
+ ajax.set("phone2", phone2);
+ ajax.set("phone3", phone3);
+ ajax.set("phone5", phone5);
+ }
+ if(type == "95128TheOnCall"){
+ ajax.set("phone4", phone4);
+ }
+ if(type == 'holidayServiceFeeSetting'){
+ ajax.set("holidayFee", holidayFee);
+ }
+
+ if(type == 'moduleManagement'){
+ ajax.set("sjzp1", sjzp1);
+ ajax.set("sjzp2", sjzp2);
+ ajax.set("zuc1", zuc1);
+ ajax.set("zuc2", zuc2);
+ ajax.set("mc1", mc1);
+ ajax.set("mc2", mc2);
+ ajax.set("czgrcl1", czgrcl1);
+ ajax.set("czgrcl2", czgrcl2);
+ ajax.set("mac1", mac1);
+ ajax.set("mac2", mac2);
+ ajax.set("sjzx1", sjzx1);
+ ajax.set("sjzx2", sjzx2);
+ ajax.set("dck1", dck1);
+ ajax.set("dck2", dck2);
+ }
+ ajax.set("type", type);
+ ajax.set("openCityId", openCityId);
+ ajax.start();
+
+ }
+
+</script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html
new file mode 100644
index 0000000..6a4a551
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>价格设置</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="省/市/区名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOpenCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOpenCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOpenCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/SystemPriceCity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOpenCity.openAddTOpenCity()"/>
+ @}
+ @if(shiro.hasPermission("/SystemPriceCity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TOpenCity.openTOpenCityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/SystemPriceCity/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TOpenCity.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOpenCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html
new file mode 100644
index 0000000..f6fe59f
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_add.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <div class="row">
+ <div class="col-sm-10">
+ <#select id="areaCode" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}">${province.name}</option>
+ @}
+ </#select>
+ <#select id="cityCode" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ </#select>
+ <#select id="provinceCode" name="区：">
+ <option value="">选择区</option>
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">专车计价规则设置</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">车型名称</th>
+ <th style="width: 300px;">价格设置</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in serverCarModelList){
+ <tr class="timeClass">
+ <td><input type="hidden" name="id" value='${obj.id}' /><input type="hidden" id="${obj.id}" name="price" value='' />${obj.name}</td>
+ <td><span id="zc_status_${obj.id}">未设置</span></td>
+ <td><a onclick="TOpenCityInfoDlg.openAddTZCPrice(${obj.id})" id="zc_set_${obj.id}" style="color:blue;">设置价格</a></td></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">出租车价格设置</label>
+ <div class="col-sm-9" style="padding-top: 7px;">
+ <input type="hidden" id="zc_price" value=''>
+ <span id="czc_status">未设置价格</span>
+ <a href="#" id="czc_set" onclick="TOpenCityInfoDlg.openAddTextPrice()" style="color: blue;">价格设置</a>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity_info.js"></script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html
new file mode 100644
index 0000000..8273c09
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/systemPriceCity_edit.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <div class="row">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="col-sm-10">
+ <#select id="areaCode" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @if(null != provinceList){
+ @for(province in provinceList){
+ <option value="${province.id}" ${province.code == item.areaCode ? 'selected' : ''}>${province.name}</option>
+ @}
+ @}
+ </#select>
+ <#select id="cityCode" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ @if(null != cityList){
+ @for(city in cityList){
+ <option value="${city.id}" ${city.code == item.cityCode ? 'selected' : ''}>${city.name}</option>
+ @}
+ @}
+ </#select>
+ <#select id="provinceCode" name="区：">
+ <option value="">选择区</option>
+ @if(null != areaList){
+ @for(area in areaList){
+ <option value="${area.id}" ${area.code == item.provinceCode ? 'selected' : ''}>${area.name}</option>
+ @}
+ @}
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">专车计价规则设置</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">车型名称</th>
+ <th style="width: 300px;">价格设置</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in serverCarModelList){
+ <tr class="timeClass">
+ <td><input type="hidden" name="id" value='${obj.id}' /><input type="hidden" id="${obj.id}" name="price" value='${obj.object}' />${obj.name}</td>
+ <td><span id="zc_status_${obj.id}">${null == obj.object ? '未设置' : '已设置'}</span></td>
+ <td><a onclick="TOpenCityInfoDlg.openAddTZCPrice(${obj.id})" id="zc_set_${obj.id}" style="color:blue;">${null == obj.object ? '设置价格' : '修改'}</a></td></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">出租车价格设置</label>
+ <div class="col-sm-9" style="padding-top: 7px;">
+ <input type="hidden" id="zc_price" value='${zcPrice}'>
+ <span id="czc_status">${null == zcPrice ? '未设置价格' : '已设置'}</span>
+ <a href="#" id="czc_set" onclick="TOpenCityInfoDlg.openAddTextPrice()" style="color: blue;">${null == zcPrice ? '价格设置' : '修改'}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/systemPriceCity_info.js"></script>
+@}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
index 3574e55..9a1859c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -44,10 +44,7 @@
<label class="col-sm-2 control-label">选择车型：</label>
<div class="col-sm-10">
<select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
- <option value="">选择车型</option>
- @for(obj in modelList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
+ <option value="${modelList.id}">${modelList.name}</option>
</select>
</div>
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
index 6a7087d..7a4666d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -37,25 +37,21 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="specialPriceInfoForm">
- <input type="hidden" id="id" value="${item.id}"/>
<div class="row">
<div class="col-sm-11">
<div class="form-group">
<label class="col-sm-2 control-label">选择车型：</label>
<div class="col-sm-10">
<select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
- <option value="">选择车型</option>
- @for(obj in modelList!){
- <option value="${obj.id}" ${item.serverCarModelId == obj.id ? 'selected' : ''}>${obj.name}</option>
- @}
+ <option value="${modelList.id}" selected}>${modelList.name}</option>
</select>
</div>
</div>
<div class="form-group waitFee">
<label class="col-sm-2 control-label">等待费设置：</label>
<div class="col-sm-10">
- 司机到达预约地点 <input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数" value="${content.num1}"/> 分钟过后开始收取等待费,
- 为 <input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数" value="${content.num2}"/> 元/分,不足一分钟按照一分钟计算
+ 司机到达预约地点 <input type="text" onblur="checkIsMinute(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数" value="${null != content ? content.num1 : ''}"/> 分钟过后开始收取等待费,
+ 为 <input type="text" onblur="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数" value="${null == content ? '' : content.num2}"/> 元/分,不足一分钟按照一分钟计算
<br/>
</div>
</div>
@@ -77,9 +73,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" value="${contentPutOne.num1}" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" value="${contentPutOne.num2}" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" value="${contentPutOne.num3}" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num1}" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num2" id="num2" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num2}" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" value="${null == contentPutOne ? '' : contentPutOne.num3}" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -87,7 +83,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutOne.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null == contentPutOne ? '' : contentPutOne.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -95,7 +91,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutOne.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutOne ? contentPutOne.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -103,18 +99,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" value="${contentPutOne.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" value="${contentPutOne.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" value="${contentPutOne.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num6" id="num6" value="${null != contentPutOne ? contentPutOne.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num7" id="num7" value="${null != contentPutOne ? contentPutOne.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num8" id="num8" value="${null != contentPutOne ? contentPutOne.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" value="${contentPutOne.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" value="${contentPutOne.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" value="${contentPutOne.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num9" id="num9" value="${null != contentPutOne ? contentPutOne.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p1')" name="num10" id="num10" value="${null != contentPutOne ? contentPutOne.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num11" id="num11" value="${null != contentPutOne ? contentPutOne.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" value="${contentPutOne.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" value="${contentPutOne.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p1')" name="num12" id="num12" value="${null != contentPutOne ? contentPutOne.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'p1')" name="num13" id="num13" value="${null != contentPutOne ? contentPutOne.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -122,17 +118,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentPutOne.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutOne.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentPutOne ? contentPutOne.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutOne ? contentPutOne.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutOne.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutOne.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutOne ? contentPutOne.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutOne ? contentPutOne.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutOne.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutOne ? contentPutOne.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutOne ? contentPutOne.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutOne ? contentPutOne.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -140,18 +136,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentPutOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentPutOne.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutOne.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentPutOne ? contentPutOne.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentPutOne ? contentPutOne.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutOne ? contentPutOne.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutOne.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutOne.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutOne ? contentPutOne.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutOne ? contentPutOne.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutOne.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutOne ? contentPutOne.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutOne ? contentPutOne.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutOne ? contentPutOne.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -160,9 +156,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" value="${contentPutTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPutTwo ? contentPutTwo.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num2" id="num2" value="${null != contentPutTwo ? contentPutTwo.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPutTwo ? contentPutTwo.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -170,7 +166,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPutTwo ? contentPutTwo.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -178,7 +174,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutTwo ? contentPutTwo.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -186,18 +182,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" value="${contentPutTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" value="${contentPutTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num6" id="num6" value="${null != contentPutTwo ? contentPutTwo.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num7" id="num7" value="${null != contentPutTwo ? contentPutTwo.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPutTwo ? contentPutTwo.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" value="${contentPutTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" value="${contentPutTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num9" id="num9" value="${null != contentPutTwo ? contentPutTwo.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p2')" name="num10" id="num10" value="${null != contentPutTwo ? contentPutTwo.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPutTwo ? contentPutTwo.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" value="${contentPutTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p2')" name="num12" id="num12" value="${null != contentPutTwo ? contentPutTwo.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPutTwo ? contentPutTwo.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -205,17 +201,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentPutTwo.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentPutTwo ? contentPutTwo.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutTwo ? contentPutTwo.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutTwo ? contentPutTwo.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutTwo ? contentPutTwo.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutTwo ? contentPutTwo.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutTwo ? contentPutTwo.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutTwo ? contentPutTwo.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -223,18 +219,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentPutTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentPutTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentPutTwo ? contentPutTwo.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentPutTwo ? contentPutTwo.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutTwo ? contentPutTwo.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutTwo ? contentPutTwo.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutTwo ? contentPutTwo.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutTwo ? contentPutTwo.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutTwo ? contentPutTwo.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutTwo ? contentPutTwo.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -243,9 +239,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPutThree.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" value="${contentPutThree.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPutThree.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPutThree ? contentPutThree.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num2" id="num2" value="${null != contentPutThree ? contentPutThree.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPutThree ? contentPutThree.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -253,7 +249,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPutThree.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPutThree ? contentPutThree.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -261,7 +257,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPutThree.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPutThree ? contentPutThree.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -269,18 +265,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" value="${contentPutThree.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" value="${contentPutThree.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPutThree.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num6" id="num6" value="${null != contentPutThree ? contentPutThree.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num7" id="num7" value="${null != contentPutThree ? contentPutThree.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPutThree ? contentPutThree.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" value="${contentPutThree.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" value="${contentPutThree.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPutThree.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num9" id="num9" value="${null != contentPutThree ? contentPutThree.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'p3')" name="num10" id="num10" value="${null != contentPutThree ? contentPutThree.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPutThree ? contentPutThree.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" value="${contentPutThree.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPutThree.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'p3')" name="num12" id="num12" value="${null != contentPutThree ? contentPutThree.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPutThree ? contentPutThree.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -288,17 +284,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentPutThree.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPutThree.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentPutThree ? contentPutThree.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPutThree ? contentPutThree.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPutThree.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPutThree.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPutThree ? contentPutThree.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPutThree ? contentPutThree.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPutThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPutThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPutThree.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPutThree ? contentPutThree.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPutThree ? contentPutThree.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPutThree ? contentPutThree.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -306,18 +302,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentPutThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentPutThree.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPutThree.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentPutThree ? contentPutThree.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentPutThree ? contentPutThree.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPutThree ? contentPutThree.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPutThree.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPutThree.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPutThree ? contentPutThree.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPutThree ? contentPutThree.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPutThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPutThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPutThree.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPutThree ? contentPutThree.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPutThree ? contentPutThree.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPutThree ? contentPutThree.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -326,9 +322,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotOne.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" value="${contentNotOne.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotOne.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotOne ? contentNotOne.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num2" id="num2" value="${null != contentNotOne ? contentNotOne.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotOne ? contentNotOne.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -336,7 +332,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotOne.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotOne ? contentNotOne.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -344,7 +340,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotOne.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotOne ? contentNotOne.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -352,18 +348,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" value="${contentNotOne.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" value="${contentNotOne.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotOne.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num6" id="num6" value="${null != contentNotOne ? contentNotOne.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num7" id="num7" value="${null != contentNotOne ? contentNotOne.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotOne ? contentNotOne.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" value="${contentNotOne.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" value="${contentNotOne.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotOne.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num9" id="num9" value="${null != contentNotOne ? contentNotOne.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp1')" name="num10" id="num10" value="${null != contentNotOne ? contentNotOne.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotOne ? contentNotOne.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" value="${contentNotOne.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotOne.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp1')" name="num12" id="num12" value="${null != contentNotOne ? contentNotOne.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotOne ? contentNotOne.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -371,17 +367,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentNotOne.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotOne.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentNotOne ? contentNotOne.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotOne ? contentNotOne.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotOne.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotOne.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotOne ? contentNotOne.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotOne ? contentNotOne.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotOne.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotOne.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotOne.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotOne ? contentNotOne.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotOne ? contentNotOne.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotOne ? contentNotOne.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -389,18 +385,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentNotOne.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentNotOne.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotOne.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentNotOne ? contentNotOne.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentNotOne ? contentNotOne.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotOne ? contentNotOne.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotOne.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotOne.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotOne ? contentNotOne.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotOne ? contentNotOne.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotOne.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotOne.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotOne.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotOne ? contentNotOne.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotOne ? contentNotOne.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotOne ? contentNotOne.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -409,9 +405,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotTwo.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" value="${contentNotTwo.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotTwo.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotTwo ? contentNotTwo.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num2" id="num2" value="${null != contentNotTwo ? contentNotTwo.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotTwo ? contentNotTwo.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -419,7 +415,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotTwo.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotTwo ? contentNotTwo.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -427,7 +423,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotTwo.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotTwo ? contentNotTwo.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -435,18 +431,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" value="${contentNotTwo.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" value="${contentNotTwo.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotTwo.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num6" id="num6" value="${null != contentNotTwo ? contentNotTwo.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num7" id="num7" value="${null != contentNotTwo ? contentNotTwo.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotTwo ? contentNotTwo.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" value="${contentNotTwo.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" value="${contentNotTwo.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotTwo.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num9" id="num9" value="${null != contentNotTwo ? contentNotTwo.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp2')" name="num10" id="num10" value="${null != contentNotTwo ? contentNotTwo.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotTwo ? contentNotTwo.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" value="${contentNotTwo.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotTwo.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp2')" name="num12" id="num12" value="${null != contentNotTwo ? contentNotTwo.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotTwo ? contentNotTwo.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -454,17 +450,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentNotTwo.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotTwo.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentNotTwo ? contentNotTwo.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotTwo ? contentNotTwo.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotTwo.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotTwo.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotTwo ? contentNotTwo.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotTwo ? contentNotTwo.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotTwo.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotTwo.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotTwo.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotTwo ? contentNotTwo.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotTwo ? contentNotTwo.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotTwo ? contentNotTwo.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -472,18 +468,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentNotTwo.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentNotTwo.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotTwo.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentNotTwo ? contentNotTwo.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentNotTwo ? contentNotTwo.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotTwo ? contentNotTwo.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotTwo.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotTwo.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotTwo ? contentNotTwo.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotTwo ? contentNotTwo.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotTwo.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotTwo.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotTwo.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotTwo ? contentNotTwo.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotTwo ? contentNotTwo.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotTwo ? contentNotTwo.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -492,9 +488,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentNotThree.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" value="${contentNotThree.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentNotThree.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentNotThree ? contentNotThree.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num2" id="num2" value="${null != contentNotThree ? contentNotThree.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentNotThree ? contentNotThree.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -502,7 +498,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentNotThree.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentNotThree ? contentNotThree.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -510,7 +506,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentNotThree.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentNotThree ? contentNotThree.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -518,18 +514,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" value="${contentNotThree.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" value="${contentNotThree.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentNotThree.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num6" id="num6" value="${null != contentNotThree ? contentNotThree.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num7" id="num7" value="${null != contentNotThree ? contentNotThree.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentNotThree ? contentNotThree.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" value="${contentNotThree.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" value="${contentNotThree.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentNotThree.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num9" id="num9" value="${null != contentNotThree ? contentNotThree.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'wp3')" name="num10" id="num10" value="${null != contentNotThree ? contentNotThree.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentNotThree ? contentNotThree.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" value="${contentNotThree.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentNotThree.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'wp3')" name="num12" id="num12" value="${null != contentNotThree ? contentNotThree.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentNotThree ? contentNotThree.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -537,17 +533,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentNotThree.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentNotThree.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentNotThree ? contentNotThree.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentNotThree ? contentNotThree.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentNotThree.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentNotThree.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentNotThree ? contentNotThree.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentNotThree ? contentNotThree.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentNotThree.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentNotThree.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentNotThree.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentNotThree ? contentNotThree.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentNotThree ? contentNotThree.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentNotThree ? contentNotThree.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -555,18 +551,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentNotThree.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentNotThree.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentNotThree.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentNotThree ? contentNotThree.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentNotThree ? contentNotThree.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentNotThree ? contentNotThree.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentNotThree.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentNotThree.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentNotThree ? contentNotThree.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentNotThree ? contentNotThree.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentNotThree.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentNotThree.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentNotThree.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentNotThree ? contentNotThree.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentNotThree ? contentNotThree.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentNotThree ? contentNotThree.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -575,7 +571,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">计价说明：</label>
<div class="col-sm-10">
- <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote1}</textarea>
+ <textarea class="form-control" id="fareTypeNote1" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote1 : ''}</textarea>
</div>
</div>
<div class="form-group">
@@ -583,7 +579,7 @@
<div class="col-sm-7">
<div class="form-group">
<div class="col-sm-9">
- <input type="checkbox" class="js-switch1" id="isOpen" ${item.isOpen == 1 ? 'checked=checked' : ''}/>
+ <input type="checkbox" class="js-switch1" id="isOpen" ${null != item && item.isOpen == 1 ? 'checked=checked' : ''}/>
</div>
</div>
</div>
@@ -595,9 +591,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentExclusive ? contentExclusive.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${null != contentExclusive ? contentExclusive.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentExclusive ? contentExclusive.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -605,7 +601,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentExclusive ? contentExclusive.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -613,7 +609,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentExclusive ? contentExclusive.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -621,18 +617,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${null != contentExclusive ? contentExclusive.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${null != contentExclusive ? contentExclusive.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${null != contentExclusive ? contentExclusive.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${null != contentExclusive ? contentExclusive.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${null != contentExclusive ? contentExclusive.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentExclusive ? contentExclusive.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${null != contentExclusive ? contentExclusive.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentExclusive ? contentExclusive.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -640,17 +636,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentExclusive ? contentExclusive.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentExclusive ? contentExclusive.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentExclusive ? contentExclusive.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentExclusive ? contentExclusive.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentExclusive ? contentExclusive.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentExclusive ? contentExclusive.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentExclusive ? contentExclusive.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -658,18 +654,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentExclusive ? contentExclusive.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentExclusive ? contentExclusive.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentExclusive ? contentExclusive.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentExclusive ? contentExclusive.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentExclusive ? contentExclusive.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentExclusive ? contentExclusive.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentExclusive ? contentExclusive.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentExclusive ? contentExclusive.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -677,7 +673,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">计价说明：</label>
<div class="col-sm-10">
- <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote2}</textarea>
+ <textarea class="form-control" id="fareTypeNote2" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote2 : ''}</textarea>
</div>
</div>
<div class="form-group">
@@ -685,7 +681,7 @@
<div class="col-sm-7">
<div class="form-group">
<div class="col-sm-9">
- <input type="checkbox" class="js-switch2" id="isOpenExclusive" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
+ <input type="checkbox" class="js-switch2" id="isOpenExclusive" ${null != item && item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
</div>
</div>
</div>
@@ -696,9 +692,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">起步价设置：</label>
<div class="col-sm-10">
- 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentPrice.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 起步包含 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" value="${contentPrice.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentPrice.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ 起步价为 <input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${null != contentPrice ? contentPrice.num1 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num2" id="num2" value="${null != contentPrice ? contentPrice.num2 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${null != contentPrice ? contentPrice.num3 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
<br/>
</div>
</div>
@@ -706,7 +702,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">里程费设置：</label>
<div class="col-sm-10">
- 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentPrice.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步里程后每公里 <input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${null != contentPrice ? contentPrice.num4 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -714,7 +710,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">时长费设置：</label>
<div class="col-sm-10">
- 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentPrice.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过起步时长后每分钟 <input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${null != contentPrice ? contentPrice.num5 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -722,18 +718,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">远途费设置：</label>
<div class="col-sm-10">
- 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" value="${contentPrice.num6}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" value="${contentPrice.num7}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${contentPrice.num8}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 总里程超过 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num6" id="num6" value="${null != contentPrice ? contentPrice.num6 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num7" id="num7" value="${null != contentPrice ? contentPrice.num7 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num8" id="num8" value="${null != contentPrice ? contentPrice.num8 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" value="${contentPrice.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里
- 不足 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" value="${contentPrice.num10}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentPrice.num11}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num9" id="num9" value="${null != contentPrice ? contentPrice.num9 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" onblur="checkIsGongLi(this, 'onePriceSetting')" name="num10" id="num10" value="${null != contentPrice ? contentPrice.num10 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${null != contentPrice ? contentPrice.num11 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
<br>
- 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" value="${contentPrice.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
- 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentPrice.num13}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 超过 <input type="text" disabled onblur="checkIsGongLi(this, 'onePriceSetting')" name="num12" id="num12" value="${null != contentPrice ? contentPrice.num12 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${null != contentPrice ? contentPrice.num13 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -741,17 +737,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">夜间行驶费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num14" id="num14" value="${contentPrice.num14}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentPrice.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num14" id="num14" value="${null != contentPrice ? contentPrice.num14 : ''}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${null != contentPrice ? contentPrice.num15 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentPrice.num16}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentPrice.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${null != contentPrice ? contentPrice.num16 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${null != contentPrice ? contentPrice.num17 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentPrice.num18}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentPrice.num19}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentPrice.num20}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${null != contentPrice ? contentPrice.num18 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${null != contentPrice ? contentPrice.num19 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${null != contentPrice ? contentPrice.num20 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -759,18 +755,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num21" id="num21" value="${contentPrice.num21}" class="form-control newWidth" placeholder="选择时间段"/>
- 和 <input type="text" name="num22" id="num22" value="${contentPrice.num22}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
- 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentPrice.num23}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <input type="text" name="num21" id="num21" value="${null != contentPrice ? contentPrice.num21 : ''}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num22" id="num22" value="${null != contentPrice ? contentPrice.num22 : ''}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${null != contentPrice ? contentPrice.num23 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentPrice.num24}" class="form-control newWidth" placeholder="最多3位数"/> 元,
- 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentPrice.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 里程费为每公里 <input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${null != contentPrice ? contentPrice.num24 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${null != contentPrice ? contentPrice.num25 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
<br>
- 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentPrice.num26}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentPrice.num27}" class="form-control newWidth" placeholder="最多3位数"/>
- 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentPrice.num28}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ 远途费为每公里加收 <input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${null != contentPrice ? contentPrice.num26 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${null != contentPrice ? contentPrice.num27 : ''}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${null != contentPrice ? contentPrice.num28 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 元
<br/>
</div>
</div>
@@ -778,16 +774,16 @@
<div class="form-group">
<label class="col-sm-2 control-label">超过预估里程设置：</label>
<div class="col-sm-10">
- 超过预估里程 <input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" value="${contentPrice.num29}" class="form-control newWidth" placeholder="最多3位数"/> 公里以内，按一口价计算
+ 超过预估里程 <input type="text" onblur="checkIsYuan(this)" name="num29" id="num29" value="${null != contentPrice ? contentPrice.num29 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以内，按一口价计算
<br>
<br>
- 超过预估里程 <input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" value="${contentPrice.num30}" class="form-control newWidth" placeholder="最多3位数"/> 公里以上，按实时计价计算
+ 超过预估里程 <input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" value="${null != contentPrice ? contentPrice.num30 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以上，按实时计价计算
<br>
<br>
- 低于预估里程 <input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" value="${contentPrice.num31}" class="form-control newWidth" placeholder="最多3位数"/> 公里以上，按实时计价计算
+ 低于预估里程 <input type="text" onblur="checkIsYuan(this)" name="num31" id="num31" value="${null != contentPrice ? contentPrice.num31 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以上，按实时计价计算
<br>
<br>
- 低于预估里程 <input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" value="${contentPrice.num32}" class="form-control newWidth" placeholder="最多3位数"/> 公里以内，按一口价计算
+ 低于预估里程 <input type="text" onblur="checkIsYuan(this)" name="num32" id="num32" value="${null != contentPrice ? contentPrice.num32 : ''}" class="form-control newWidth" placeholder="最多3位数"/> 公里以内，按一口价计算
<br>
<br>
</div>
@@ -795,7 +791,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">计价说明：</label>
<div class="col-sm-10">
- <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote3}</textarea>
+ <textarea class="form-control" id="fareTypeNote3" name="fareTypeNote" style="height: 100px;">${null != item ? item.fareTypeNote3 : ''}</textarea>
</div>
</div>
<div class="form-group">
@@ -803,7 +799,7 @@
<div class="col-sm-7">
<div class="form-group">
<div class="col-sm-9">
- <input type="checkbox" class="js-switch3" id="isOpenPrice" ${item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
+ <input type="checkbox" class="js-switch3" id="isOpenPrice" ${null != item && item.isOpenExclusive == 1 ? 'checked=checked' : ''}/>
</div>
</div>
</div>
@@ -817,7 +813,7 @@
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.editSubmit()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.addSubmit()"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
</div>
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
index a164a6c..a152350 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/taxiSet.html
@@ -90,7 +90,6 @@
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addTaxiSubmit()"/>
-<!-- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>-->
</div>
</div>
</div>
@@ -121,27 +120,12 @@
});
waitFee = waitFee.substring(0,waitFee.length-1);
waitFee += '}';
- console.log(waitFee);
+ console.log(btoa(waitFee));
-
-
- //提交信息
- var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/taxiSet", function(data){
- if (500 == data.code){
- Feng.error(data.message);
- return;
- }else{
- Feng.success("添加成功!");
- window.parent.TSystemPrice.table.refresh();
- TSystemPriceInfoDlg.close();
- }
- },function(data){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- });
- ajax.setData({
- content: waitFee
- })
- ajax.start();
+ window.parent.document.getElementById("zc_price").value = btoa(waitFee);
+ window.parent.document.getElementById("czc_status").innerText = "已设置";
+ window.parent.document.getElementById("czc_set").innerText = "修改";
+ parent.layer.close(window.parent.TOpenCityInfoDlg.layerIndex);
}
laydate.render({
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js
index f44dd05..2669636 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js
@@ -159,6 +159,21 @@
}
};
+TOpenCity.systemSet = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '设置基础配置',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOpenCity/tOpenCity_systemSet/' + TOpenCity.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+
/**
* 查询城市管理列表
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js
new file mode 100644
index 0000000..4ec63b5
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity.js
@@ -0,0 +1,154 @@
+/**
+ * 城市管理管理初始化
+ */
+var TOpenCity = {
+ id: "TOpenCityTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+};
+
+/**
+ * 初始化表格的列
+ */
+TOpenCity.initColumn = function () {
+ return [
+ {field: 'selectItem', radio: true},
+ {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'10%'},
+ {title: '省', field: 'areaName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.areaName != '' && row.areaName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.areaName + '" onfocus="TUser.tooltip()">' + row.areaName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '市', field: 'cityName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.cityName != '' && row.cityName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cityName + '" onfocus="TUser.tooltip()">' + row.cityName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '区', field: 'provinceName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.provinceName != '' && row.provinceName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.provinceName + '" onfocus="TUser.tooltip()">' + row.provinceName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "<a href='#' onclick='TOpenCity.openTOpenCityDetail(" + value + ")' style='color:blue;'>编辑</a> <a href='#' onclick='TOpenCity.delete(" + value + ")' style='color:blue;'>删除</a>";
+ return btn;
+ }
+ }
+ ];
+};
+
+/**
+ * 检查是否选中
+ */
+TOpenCity.check = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }else{
+ TOpenCity.seItem = selected[0];
+ return true;
+ }
+};
+
+/**
+ * 点击添加城市管理
+ */
+TOpenCity.openAddTOpenCity = function () {
+ var index = layer.open({
+ type: 2,
+ title: '添加价格',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tSystemPrice/systemPriceCity_add'
+ });
+ this.layerIndex = index;
+};
+
+/**
+ * 打开查看城市管理详情
+ */
+TOpenCity.openTOpenCityDetail = function (id) {
+ if (null == id && this.check()) {
+ id = TOpenCity.seItem.id;
+ }
+ if(null != id){
+ var index = layer.open({
+ type: 2,
+ title: '编辑价格',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tSystemPrice/systemPriceCity_update?id=' + id
+ });
+ this.layerIndex = index;
+ }
+};
+
+/**
+ * 删除城市管理
+ */
+TOpenCity.delete = function (id) {
+ if (null == id && this.check()) {
+ id = TOpenCity.seItem.id;
+ }
+ if(null != id){
+ var name = "该价格设置";
+ swal({
+ title: "您是否确认删除" + name + "?",
+ text: "请谨慎操作,删除后不可恢复！",
+ type: "warning",
+ showCancelButton: true,
+ confirmButtonColor: "#DD6B55",
+ confirmButtonText: "删除",
+ closeOnConfirm: false
+ }, function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/opt", function (data) {
+ swal("删除成功", "您已经成功删除了" + name + "。", "success");
+ TOpenCity.table.refresh();
+ }, function (data) {
+ swal("删除失败", data.responseJSON.message + "！", "warning");
+ });
+ ajax.set("id", id);
+ ajax.start();
+ });
+ }
+};
+
+/**
+ * 查询城市管理列表
+ */
+TOpenCity.search = function () {
+ var queryData = {};
+ queryData['insertTime'] = $("#insertTime").val();
+ queryData['condition'] = $("#condition").val();
+ TOpenCity.table.refresh({query: queryData});
+};
+TOpenCity.resetSearch = function () {
+ $("#insertTime").val("");
+ $("#condition").val("");
+ TOpenCity.search();
+};
+
+$(function () {
+ var defaultColunms = TOpenCity.initColumn();
+ var table = new BSTable(TOpenCity.id, "/tSystemPrice/queryList", defaultColunms);
+ table.setPaginationType("server");
+ TOpenCity.table = table.init();
+});
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js
new file mode 100644
index 0000000..3b219f8
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/systemPriceCity_info.js
@@ -0,0 +1,262 @@
+/**
+ * 初始化城市管理详情对话框
+ */
+var TOpenCityInfoDlg = {
+ tOpenCityInfoData : {},
+ editor: null,
+ validateFields: {
+ areaCode: {
+ validators: {
+ notEmpty: {
+ message: '请选择省'
+ }
+ }
+ }
+ }
+};
+
+/**
+ * 验证数据是否为空
+ */
+TOpenCityInfoDlg.validate = function () {
+ $('#openCityForm').data("bootstrapValidator").resetForm();
+ $('#openCityForm').bootstrapValidator('validate');
+ return $("#openCityForm").data('bootstrapValidator').isValid();
+};
+
+
+/**
+ * 清除数据
+ */
+TOpenCityInfoDlg.clearData = function() {
+ this.tOpenCityInfoData = {};
+}
+
+/**
+ * 设置对话框中的数据
+ *
+ * @param key 数据的名称
+ * @param val 数据的具体值
+ */
+TOpenCityInfoDlg.set = function(key, val) {
+ this.tOpenCityInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
+ return this;
+}
+
+/**
+ * 设置对话框中的数据
+ *
+ * @param key 数据的名称
+ * @param val 数据的具体值
+ */
+TOpenCityInfoDlg.get = function(key) {
+ return $("#" + key).val();
+}
+
+/**
+ * 关闭此对话框
+ */
+TOpenCityInfoDlg.close = function() {
+ parent.layer.close(window.parent.TOpenCity.layerIndex);
+}
+
+/**
+ * 收集数据
+ */
+TOpenCityInfoDlg.collectData = function() {
+ this
+ .set('id')
+ .set('areaCode')
+ .set('cityCode')
+ .set('provinceCode')
+}
+
+
+TOpenCityInfoDlg.openAddTextPrice = function () {
+ var index = layer.open({
+ type: 2,
+ title: '添加出租车价格',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tSystemPrice/taxi?price=' + $('#zc_price').val()
+ });
+ this.layerIndex = index;
+};
+
+
+TOpenCityInfoDlg.openAddTZCPrice = function (id){
+ var index = layer.open({
+ type: 2,
+ title: '添加专车价格',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tSystemPrice/tSystemPrice_add?id=' + id + "&price=" + $('#' + id).val()
+ });
+ this.layerIndex = index;
+}
+
+
+
+
+/**
+ * 提交添加
+ */
+TOpenCityInfoDlg.addSubmit = function() {
+
+ this.clearData();
+ this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+ var zcArr=[];
+ $("#coun tr").each(function () {
+ var value = $(this).find("input[name='price']").val();
+ if('' != value && null != value){
+ zcArr.push(JSON.parse(atob(value)))
+ }
+ });
+ if(zcArr.length == 0){
+ Feng.error("请配置专车价格")
+ return;
+ }
+
+ console.log(zcArr);
+ var zczArr = $('#zc_price').val();
+ if(null == zczArr || zczArr == ''){
+ Feng.error("请配置出租车价格")
+ return;
+ }
+ if(null != this.tOpenCityInfoData.areaCode && '' != this.tOpenCityInfoData.areaCode){
+ this.tOpenCityInfoData.areaName = $('#areaCode').find('option:selected').text();
+ }
+ if(null != this.tOpenCityInfoData.cityCode && '' != this.tOpenCityInfoData.cityCode){
+ this.tOpenCityInfoData.cityName = $('#cityCode').find('option:selected').text();
+ }
+ if(null != this.tOpenCityInfoData.provinceCode && '' != this.tOpenCityInfoData.provinceCode){
+ this.tOpenCityInfoData.provinceName = $('#provinceCode').find('option:selected').text();
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/add", function(data){
+ Feng.success("添加成功!");
+ window.parent.TOpenCity.table.refresh();
+ TOpenCityInfoDlg.close();
+ },function(data){
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set(this.tOpenCityInfoData);
+ ajax.set("zcPrice",JSON.stringify(zcArr));
+ ajax.set("czcPrice", atob(zczArr));
+ ajax.start();
+}
+
+/**
+ * 提交修改
+ */
+TOpenCityInfoDlg.editSubmit = function() {
+ this.clearData();
+ this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+ var zcArr=[];
+ $("#coun tr").each(function () {
+ var value = $(this).find("input[name='price']").val();
+ if('' != value && null != value){
+ zcArr.push(JSON.parse(atob(value)))
+ }
+ });
+ if(zcArr.length == 0){
+ Feng.error("请配置专车价格")
+ return;
+ }
+
+ console.log(zcArr);
+ var zczArr = $('#zc_price').val();
+ if(null == zczArr || zczArr == ''){
+ Feng.error("请配置出租车价格")
+ return;
+ }
+ if(null != this.tOpenCityInfoData.areaCode && '' != this.tOpenCityInfoData.areaCode){
+ this.tOpenCityInfoData.areaName = $('#areaCode').find('option:selected').text();
+ }
+ if(null != this.tOpenCityInfoData.cityCode && '' != this.tOpenCityInfoData.cityCode){
+ this.tOpenCityInfoData.cityName = $('#cityCode').find('option:selected').text();
+ }
+ if(null != this.tOpenCityInfoData.provinceCode && '' != this.tOpenCityInfoData.provinceCode){
+ this.tOpenCityInfoData.provinceName = $('#provinceCode').find('option:selected').text();
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/update", function(data){
+ Feng.success("修改成功!");
+ window.parent.TOpenCity.table.refresh();
+ TOpenCityInfoDlg.close();
+ },function(data){
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set(this.tOpenCityInfoData);
+ ajax.set("zcPrice",JSON.stringify(zcArr));
+ ajax.set("czcPrice", atob(zczArr));
+ ajax.start();
+}
+
+$(function() {
+ Feng.initValidator("openCityForm", TOpenCityInfoDlg.validateFields);
+});
+
+/**
+ * 省改变时执行
+ */
+TOpenCityInfoDlg.provinceChange = function () {
+ var provinceId = $("#areaCode").val();
+ var ajax = new $ax(Feng.ctxPath + "/tOpenCity/change", function(data){
+ if(data!=null){
+ var content='<option value="">选择市</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#cityCode").empty().append(content);
+ $("#provinceCode").empty().append('<option value="">选择区</option>');
+ }
+ });
+ ajax.set("id",provinceId);
+ ajax.start();
+}
+/**
+ * 市改变时执行
+ */
+TOpenCityInfoDlg.cityChange = function () {
+ var cityId = $("#cityCode").val();
+ var ajax = new $ax(Feng.ctxPath + "/tOpenCity/change", function(data){
+ if(data!=null){
+ var content='<option value="">选择区</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#provinceCode").empty().append(content);
+ }
+ });
+ ajax.set("id",cityId);
+ ajax.start();
+}
+
+
+//获取当前时间，格式YYYY-MM-DD
+function getNowFormatDate() {
+ var date = new Date();
+ var seperator1 = "-";
+ var year = date.getFullYear();
+ var month = date.getMonth() + 1;
+ var strDate = date.getDate();
+ if (month >= 1 && month <= 9) {
+ month = "0" + month;
+ }
+ if (strDate >= 0 && strDate <= 9) {
+ strDate = "0" + strDate;
+ }
+ var currentdate = year + seperator1 + month + seperator1 + strDate;
+ return currentdate;
+}
\ No newline at end of file
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
index 252894c..231b3a3 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js
@@ -119,7 +119,7 @@
* 关闭此对话框
*/
TSystemPriceInfoDlg.close = function() {
- parent.layer.close(window.parent.TSystemPrice.layerIndex);
+ parent.layer.close(window.parent.TOpenCityInfoDlg.layerIndex);
}
/**
@@ -322,21 +322,7 @@
isOpenPrice = 2;
}
-
- //提交信息
- var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/add", function(data){
- if (500 == data.code){
- Feng.error(data.message);
- return;
- }else{
- Feng.success("添加成功!");
- window.parent.TSystemPrice.table.refresh();
- TSystemPriceInfoDlg.close();
- }
- },function(data){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- });
- ajax.setData({
+ var jsonStr = {
serverCarModelId: serverCarModelId,
content: waitFee,
fareTypeNote1: fareTypeNote1,
@@ -353,8 +339,12 @@
isOpen: isOpen,
isOpenExclusive: isOpenExclusive,
isOpenPrice: isOpenPrice
- })
- ajax.start();
+ };
+ window.parent.document.getElementById(serverCarModelId).value = btoa(JSON.stringify(jsonStr));
+ window.parent.document.getElementById("zc_status_" + serverCarModelId).innerText = "已设置";
+ window.parent.document.getElementById("zc_set_" + serverCarModelId).innerText = "修改";
+ TSystemPriceInfoDlg.close();
+
}
/**
--
Gitblit v1.7.1