From e809f5955584e600d8612540ea814977c49774c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 八月 2025 23:51:54 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java | 2
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 28
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 150 +++++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java | 163 +++---
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html | 9
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java | 14
ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js | 18
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java | 7
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 21
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java | 17
ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml | 4
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html | 2
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 10
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java | 7
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 30 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java | 46 +
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java | 40 -
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java | 4
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 205 ++++---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml | 22
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 42 +
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js | 11
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 59 ++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java | 1
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 305 ++++++------
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java | 7
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 64 ++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java | 12
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 6
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java | 8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java | 13
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java | 10
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java | 3
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 2
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ExcelUtil.java | 1
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml | 3
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 21
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 1
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 7
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 25
50 files changed, 950 insertions(+), 490 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
index 6844037..dad0ac5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
@@ -206,7 +206,7 @@
registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
- registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://192.168.110.85:8010");
+ registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010");
}
if("test".equals(activeProfile)){
registrationBean.setFilter(onconMDCasFilter);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ExcelUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ExcelUtil.java
index 9e00af7..7f9468c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ExcelUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ExcelUtil.java
@@ -55,7 +55,6 @@
// 第四步，创建单元格，并设置值表头 设置表头居中
HSSFCellStyle style = wb.createCellStyle();
style.setLocked(true);
- style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
HSSFCell cell = null;
cell = row.createCell(0);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index 2337210..4ba0d90 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -22,6 +22,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 首页统计
@@ -77,7 +79,9 @@
@Autowired
private ShiroExtUtil shiroExtUtil;
-
+ @Autowired
+ private ITOrderPrivateCarService iTOrderPrivateCarService;
+
@RequestMapping("/openNetCarInfo")
public Object openNetCarInfo(Integer id, Model model) {
model.addAttribute("id", id);
@@ -139,14 +143,22 @@
}
int i = tUserService.selectCount(ne);
map1.put("passengerInfo", i); //新增用户
-
- Wrapper<TDriver> ne1 = new EntityWrapper<TDriver>().ne("state", 1).eq("authState", 2).ne("flag", 3);
+ redisTemplate.opsForValue().set("dache:DRIVER14", "123456", 30, TimeUnit.SECONDS);
+
+ Wrapper<TDriver> warpper = new EntityWrapper<TDriver>().eq("authState", 2).eq("state", 2).ne("flag", 3);
if (companyId != null) {
- ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ warpper.eq("companyId", companyId);
}
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().ne("state", 1).eq("authState", 2).ne("flag", 3));
+ List<TDriver> tDrivers = tDriverService.selectList(warpper);
+ int count = 0;
+ for (TDriver tDriver : tDrivers) {
+ Boolean hasKey = redisTemplate.hasKey("dache:DRIVER" + tDriver.getId());
+ if(hasKey){
+ count++ ;
+ }
+ }
map1.put("netcardriver", count); //在线司机
-
+
Wrapper<TOrderTaxi> travelTime1 = new EntityWrapper<TOrderTaxi>().between("insertTime", calendar1.getTime(), calendar2.getTime());
if (companyId != null) {
travelTime1.eq("companyId", companyId);
@@ -411,12 +423,31 @@
}
map.put("driver", list);
+
+
Map<String, Object> map2 = new HashMap<>();
- Wrapper<TOrderTaxi> eq = new EntityWrapper<TOrderTaxi>().eq("state", 1).eq("isDelete", 1);
+ Wrapper<TOrderPrivateCar> eq = new EntityWrapper<TOrderPrivateCar>().eq("state", 1).eq("isDelete", 1);
if(companyId != null){
eq.eq("companyId", companyId);
}
- List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(eq);
+ List<TOrderPrivateCar> tOrderPrivateCars = iTOrderPrivateCarService.selectList(eq);
+ list = new ArrayList<>();
+ for(TOrderPrivateCar t : tOrderPrivateCars){
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("start", t.getStartAddress());
+ map1.put("end", t.getEndAddress());
+ map1.put("travelTime", t.getTravelTime());
+ map1.put("carModel", "");
+ map1.put("num", 1);
+ list.add(map1);
+ }
+ map2.put("zhuanche", list);
+
+ Wrapper<TOrderTaxi> eq1 = new EntityWrapper<TOrderTaxi>().eq("state", 1).eq("isDelete", 1);
+ if(companyId != null){
+ eq1.eq("companyId", companyId);
+ }
+ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(eq1);
list = new ArrayList<>();
for(TOrderTaxi t : tOrderTaxis){
Map<String, Object> map1 = new HashMap<>();
@@ -437,8 +468,18 @@
@ResponseBody
@PostMapping("/getAllOrder")
public Object getAllOrder(){
- List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1));
+ List<TOrderPrivateCar> orderPrivateCars = itOrderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("isDelete", 1).in("state", Arrays.asList(8, 9)));
List list = new ArrayList<>();
+ for(TOrderPrivateCar t : orderPrivateCars){
+ Map<String, Object> map = new HashMap<>();
+ if(Objects.isNull(t.getStartLon()) || Objects.isNull(t.getStartLat())){
+ continue;
+ }
+ map.put("lon", t.getStartLon());
+ map.put("lat", t.getStartLat());
+ list.add(map);
+ }
+ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1).in("state", Arrays.asList(8, 9)));
for(TOrderTaxi t : tOrderTaxis){
Map<String, Object> map = new HashMap<>();
if(Objects.isNull(t.getStartLon()) || Objects.isNull(t.getStartLat())){
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java
index 4294568..f9a5fde 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java
@@ -54,8 +54,9 @@
if (ToolUtil.isNotEmpty(state)){
wrapper.eq("state",state);
}
-
- page.setRecords(additionalFeeService.selectMapsPage(page,wrapper).getRecords());
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ wrapper.eq("companyId", objectId);
+ page.setRecords(additionalFeeService.selectMapsPage(page, wrapper).getRecords());
return super.packForBT(page);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 91a7143..ba8292b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -72,6 +72,9 @@
@Autowired
private ITLineService itLineService;
+
+ @Autowired
+ private ITRegionService tRegionService;
@Autowired
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
@@ -185,6 +188,8 @@
//查询线路列表
List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
model.addAttribute("lineList",lineList);
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
return PREFIX + "tDriver_add.html";
}
@@ -314,6 +319,25 @@
//查询驾驶员已添加的线路列表
List<Map<String, Object>> driverLineList = tDriverLineService.getDriverLineListByDriverId(tDriverId);
model.addAttribute("driverLineList",driverLineList);
+ model.addAttribute("provinceId", 1);
+ if(ToolUtil.isNotEmpty(tDriver.getPlaceOfEmployment())){
+ TRegion area = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tDriver.getPlaceOfEmployment()));
+ model.addAttribute("areaId",area.getId());
+ TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", area.getParentId()));
+ model.addAttribute("cityId",city.getId());
+ TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", city.getParentId()));
+ model.addAttribute("provinceId",province.getId());
+
+ //市
+ List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", city.getParentId()));
+ model.addAttribute("cityList",cityList);
+ //区
+ List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", area.getParentId()));
+ model.addAttribute("areaList",areaList);
+ }
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
return PREFIX + "tDriver_edit.html";
}
@@ -747,6 +771,14 @@
if (count > 0){
return "error";
}
+ if(ToolUtil.isEmpty(tDriver.getIdCard())){
+ return "身份证号不能为空";
+ }
+ Boolean b = UserUtil.idCardAuth(tDriver.getName(), tDriver.getIdCard());
+ if(!b){
+ return "司机姓名和身份证号不匹配";
+ }
+
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -1006,6 +1038,13 @@
return "error";
}
}
+ if(ToolUtil.isEmpty(tDriver.getIdCard())){
+ return "身份证号不能为空";
+ }
+ Boolean b = UserUtil.idCardAuth(tDriver.getName(), tDriver.getIdCard());
+ if(!b){
+ return "司机姓名和身份证号不匹配";
+ }
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -1089,6 +1128,7 @@
obj.setEmergencyContactAddress(tDriver.getEmergencyContactAddress());
obj.setUpdateTime(new Date());
obj.setUpdateUser(shiroExtUtil.getUser().getId());
+ obj.setPlaceOfEmployment(tDriver.getPlaceOfEmployment());
tDriverService.updateAllColumnById(obj);
//删除业务
@@ -1158,6 +1198,7 @@
shellList.add("经营业务:跨城出行[是/否]");
shellList.add("登录账号[手机号]");
shellList.add("登录密码[密码长度为6-18]");
+ shellList.add("从业地行政编号");
} else if (shiroExtUtil.getUser().getRoleType() == 2) {
title = "分公司导入司机模板";
@@ -1175,6 +1216,7 @@
shellList.add("经营业务:跨城出行[是/否]");
shellList.add("登录账号[手机号]");
shellList.add("登录密码[密码长度为6-18]");
+ shellList.add("从业地行政编号");
} else if (shiroExtUtil.getUser().getRoleType() == 3) {
title = "加盟商导入司机模板";
@@ -1191,6 +1233,7 @@
shellList.add("经营业务:跨城出行[是/否]");
shellList.add("登录账号[手机号]");
shellList.add("登录密码[密码长度为6-18]");
+ shellList.add("从业地行政编号");
}
dataList.add(shellList);
@@ -1248,7 +1291,7 @@
break;
}
}
-
+
Cell cell2 = row.getCell(2); //所属分公司[提示:加盟司机选填]
String two = null;
if (SinataUtil.isNotEmpty(cell2)) {
@@ -1445,10 +1488,24 @@
}
}
+ Cell cell20 = row.getCell(16); //从业地行政编号
+ String cell201 = null;
+ if (SinataUtil.isNotEmpty(cell20)){
+ int cellType = cell20.getCellType();
+ switch (cellType) {
+ case Cell.CELL_TYPE_STRING:
+ cell201 = cell20.getStringCellValue().trim();
+ break;
+ case Cell.CELL_TYPE_NUMERIC:
+ cell201 = String.valueOf((long)cell20.getNumericCellValue()).trim();
+ break;
+ }
+ }
+
if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
|| SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(nine)
|| SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
- || SinataUtil.isEmpty(seventeen)|| SinataUtil.isEmpty(eighteen)){
+ || SinataUtil.isEmpty(seventeen)|| SinataUtil.isEmpty(eighteen)|| SinataUtil.isEmpty(cell201)){
return new ErrorTip(500, "单元格不能为空");
}else{
//判断账号是否存在
@@ -1456,7 +1513,10 @@
if (count > 0){
continue;
}
-
+ Boolean b = UserUtil.idCardAuth(zero, seven);
+ if(!b){
+ return new ErrorTip(500, "司机姓名和身份证号不匹配");
+ }
//判断所属机构
if (!one.equals("平台司机") && !one.equals("加盟司机")){
return new ErrorTip(500, "所属机构内容不正确");
@@ -1488,6 +1548,10 @@
//判断登录密码
if (!isPassword(eighteen)){
return new ErrorTip(500, "登录密码格式不正确");
+ }
+ //从业地行政编号
+ if (!isPassword(cell201)){
+ return new ErrorTip(500, "从业地行政编号不正确");
}
//查找平台公司
@@ -1539,10 +1603,11 @@
driver.setInsertTime(new Date());
driver.setAddType(2);
driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
+ driver.setPlaceOfEmployment(cell201);
if (SinataUtil.isNotEmpty(eight)) {
driver.setDriverAddress(eight);
}
-
+
//审核通过，在中台添加司机账号
if (2 == driver.getAuthState()) {
Integer objectId = driver.getCompanyId();
@@ -1575,15 +1640,15 @@
empId = userInfoByPhone.get(0).getEmpId();
empnew = 0;
}
-
+
driver.setEmpId(empId);
driver.setEntercode(tCompany.getEnterCode());
driver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
driver.setEmpnew(empnew);
}
tDriverService.insert(driver);
-
-
+
+
//添加快车服务模式
if ("是".equals(eleven)) {
TDriverService service = new TDriverService();
@@ -1612,7 +1677,7 @@
Sheet sh = book.getSheetAt(0); //获取到第一个表
for (int i = 1; i <= sh.getLastRowNum(); i++) {
Row row = sh.getRow(i);
-
+
Cell cell0 = row.getCell(0); //司机名称
String zero = null;
if (SinataUtil.isNotEmpty(cell0)) {
@@ -1626,7 +1691,7 @@
break;
}
}
-
+
Cell cell1 = row.getCell(1); //所属加盟商[选填]
String one = null;
if (SinataUtil.isNotEmpty(cell1)) {
@@ -1640,7 +1705,7 @@
break;
}
}
-
+
Cell cell2 = row.getCell(2); //性别[男/女]
String two = null;
if (SinataUtil.isNotEmpty(cell2)) {
@@ -1808,16 +1873,36 @@
break;
}
}
+
+ Cell cell17 = row.getCell(14); //从业地行政编号
+ String cell1701 = null;
+ if (SinataUtil.isNotEmpty(cell17)){
+ int cellType = cell17.getCellType();
+ switch (cellType) {
+ case Cell.CELL_TYPE_STRING:
+ cell1701 = cell17.getStringCellValue().trim();
+ break;
+ case Cell.CELL_TYPE_NUMERIC:
+ cell1701 = String.valueOf((long)cell17.getNumericCellValue()).trim();
+ break;
+ }
+ }
if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
|| SinataUtil.isEmpty(five) || SinataUtil.isEmpty(seven)
|| SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)){
+ || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(fifteen)
+ || SinataUtil.isEmpty(sixteen) || SinataUtil.isEmpty(cell1701)){
return new ErrorTip(500, "单元格不能为空");
}else{
//判断账号是否存在
int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fifteen).in("authState", "1,2,3").ne("flag", 3));
if (count > 0){
continue;
+ }
+
+ Boolean b = UserUtil.idCardAuth(zero, five);
+ if(!b){
+ return new ErrorTip(500, "司机姓名和身份证号不匹配");
}
//判断性别
if (!two.equals("男") && !two.equals("女")){
@@ -1847,6 +1932,12 @@
if (!isPassword(sixteen)) {
return new ErrorTip(500, "登录密码格式不正确");
}
+ //从业地行政编号
+ if (!isPassword(cell1701)) {
+ return new ErrorTip(500, "从业地行政编号不正确");
+ }
+
+
//查找平台公司
Integer companyId = shiroExtUtil.getUser().getObjectId();
Integer franchiseeId = 0;
@@ -1857,7 +1948,7 @@
franchiseeId = franchisee.getId();
}
}
-
+
TDriver driver = new TDriver();
driver.setAccount(fifteen);
driver.setJobNumber(eight);
@@ -1883,11 +1974,12 @@
driver.setInsertTime(new Date());
driver.setAddType(3);
driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
+ driver.setPlaceOfEmployment(cell1701);
if (SinataUtil.isNotEmpty(six)) {
driver.setDriverAddress(six);
}
tDriverService.insert(driver);
-
+
//添加快车服务模式
if ("是".equals(nine)) {
TDriverService service = new TDriverService();
@@ -1909,7 +2001,7 @@
service.setType(3);
itDriverServiceService.insert(service);
}
-
+
}
}
} else if (shiroExtUtil.getUser().getRoleType() == 3) {
@@ -1917,7 +2009,7 @@
Sheet sh = book.getSheetAt(0); //获取到第一个表
for (int i = 1; i <= sh.getLastRowNum(); i++) {
Row row = sh.getRow(i);
-
+
Cell cell0 = row.getCell(0); //司机名称
String zero = null;
if (SinataUtil.isNotEmpty(cell0)) {
@@ -1931,7 +2023,7 @@
break;
}
}
-
+
Cell cell2 = row.getCell(1); //性别[男/女]
String one = null;
if (SinataUtil.isNotEmpty(cell2)) {
@@ -1945,7 +2037,7 @@
break;
}
}
-
+
Cell cell3 = row.getCell(2); //驾驶证号码
String two = null;
if (SinataUtil.isNotEmpty(cell3)) {
@@ -2099,16 +2191,35 @@
break;
}
}
+
+ Cell cell17 = row.getCell(13); //登录密码[密码长度为6-18]
+ String cell1701 = null;
+ if (SinataUtil.isNotEmpty(cell17)){
+ int cellType = cell17.getCellType();
+ switch (cellType) {
+ case Cell.CELL_TYPE_STRING:
+ cell1701 = cell17.getStringCellValue().trim();
+ break;
+ case Cell.CELL_TYPE_NUMERIC:
+ cell1701 = String.valueOf((long)cell17.getNumericCellValue()).trim();
+ break;
+ }
+ }
if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
|| SinataUtil.isEmpty(six) || SinataUtil.isEmpty(eight)
|| SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) ){
+ || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen)
+ || SinataUtil.isEmpty(cell1701)){
return new ErrorTip(500, "单元格不能为空");
}else{
//判断账号是否存在
int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fourteen).in("authState", "1,2,3").ne("flag", 3));
if (count > 0){
continue;
+ }
+ Boolean b = UserUtil.idCardAuth(zero, four);
+ if(!b){
+ return new ErrorTip(500, "司机姓名和身份证号不匹配");
}
//判断性别
if (!one.equals("男") && !one.equals("女")){
@@ -2175,6 +2286,7 @@
driver.setInsertTime(new Date());
driver.setAddType(4);
driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
+ driver.setPlaceOfEmployment(cell1701);
if (SinataUtil.isNotEmpty(five)) {
driver.setDriverAddress(five);
}
@@ -2326,7 +2438,7 @@
shellList.add("-");
}
if(SinataUtil.isNotEmpty(object.get("sex"))){
- shellList.add(object.get("sex").toString() == "1"?"男":"女");
+ shellList.add(object.get("sex").toString().equals("1")?"男":"女");
}else{
shellList.add("-");
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
index ff51ca8..42aec37 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -112,7 +112,7 @@
public String tOrderPrivateCarUpdate(Integer tOrderPrivateCarId,Integer type, Model model) {
if(type==1){
Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
-
+ TOrderPrivateCar tOrderPrivateCar1 = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
Object o1 = item.get("abnormalImg");
if(o1!=null){
String[] split = o1.toString().split(",");
@@ -121,12 +121,11 @@
model.addAttribute("abnormalImg",new String[]{});
}
// money是修改后的金额
- model.addAttribute("money",0);
+ model.addAttribute("money","");
Object o2 = item.get("responsibilityType");
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum",tOrderPrivateCarId));
- model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
+ model.addAttribute("money", tOrderPrivateCar1.getResponsibilityMoney());
}
}
model.addAttribute("item",item);
@@ -144,6 +143,7 @@
model.addAttribute("maps",maps);
}else if(type==2){
Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderPrivateCarId);
+ TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectById(tOrderPrivateCarId);
Object o1 = item.get("abnormalImg");
if(o1!=null){
String[] split = o1.toString().split(",");
@@ -152,18 +152,18 @@
model.addAttribute("abnormalImg",new String[]{});
}
Object o2 = item.get("responsibilityType");
- model.addAttribute("money",0);
+ model.addAttribute("money","");
model.addAttribute("show",0);
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum",tOrderPrivateCarId));
- model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
+ model.addAttribute("money", tOrderCrossCity.getResponsibilityMoney());
}
}
model.addAttribute("type",2);
model.addAttribute("item",item);
}else if(type==3){
Map<String, Object> item = tOrderTaxiService.getTaxiOrderDetailById(tOrderPrivateCarId);
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderPrivateCarId);
Object o1 = item.get("abnormalImg");
if(o1!=null){
String[] split = o1.toString().split(",");
@@ -171,13 +171,12 @@
}else {
model.addAttribute("abnormalImg",new String[]{});
}
- model.addAttribute("money",0);
+ model.addAttribute("money","");
model.addAttribute("show",0);
Object o2 = item.get("responsibilityType");
if(o2!=null){
if(Integer.valueOf(o2.toString())>2){
- TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum",tOrderPrivateCarId));
- model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
+ model.addAttribute("money", tOrderTaxi.getResponsibilityMoney());
}
}
model.addAttribute("type",3);
@@ -309,7 +308,7 @@
// 快车
if(type==1){
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
- orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus));
+ orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, null));
return super.packForBT(page);
// 跨城
}else if(type==2){
@@ -689,38 +688,9 @@
if(type==1){
TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
userId = tOrderPrivateCar.getUserId();
- tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
- tOrderPrivateCar.setAbnormalStatus(2);
- if(responsibilityTypeVal>3){
- tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getOrderMoney());
- tOrderPrivateCar.setOrderMoney(new BigDecimal(money));
- }
- if(responsibilityTypeVal>2){
- // 追偿订单记录表
- TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
- tAbnormalPayOrder.setOrderNum(orderNum);
- tAbnormalPayOrder.setOrderNo(tOrderPrivateCar.getOrderNum());
- tAbnormalPayOrder.setType(1);
- tAbnormalPayOrder.setUserId(tOrderPrivateCar.getUserId());
- tAbnormalPayOrder.setPayStatus(1);
- tAbnormalPayOrder.setPayTime(new Date());
- if(responsibilityTypeVal==3){
- tAbnormalPayOrder.setPayMoney(tOrderPrivateCar.getPayMoney());
- }else {
- tAbnormalPayOrder.setPayMoney(new BigDecimal( money));
- }
- tAbnormalPayOrder.setCompanyId(tOrderPrivateCar.getCompanyId());
- tAbnormalPayOrderService.insert(tAbnormalPayOrder);
- }
- if(responsibilityTypeVal<3){
- tOrderPrivateCar.setState(9);
- tOrderPrivateCar.setPayType(5);
- }
- tOrderPrivateCar.setAbnormalRemark(remark);
- tOrderPrivateCarService.updateById(tOrderPrivateCar);
- //平台全责和司机全责需要调起备付金支付
- if(9 == tOrderPrivateCar.getState()){
+ //平台全责需要调起备付金支付
+ if(1 == responsibilityTypeVal){
TDriver driver = tDriverService.selectById(tOrderPrivateCar.getDriverId());
TCompany company = tCompanyMapper.selectById(driver.getCompanyId());
TUser userInfo = userService.selectById(tOrderPrivateCar.getUserId());
@@ -789,37 +759,59 @@
}
OrderUtil.modifyTravelItinerary(request1);
}
+
+ tOrderPrivateCar.setPayType(5);
+ tOrderPrivateCar.setPayMoney(tOrderPrivateCar.getOrderMoney());
+ tOrderPrivateCar.setState(9);
+ tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getOrderMoney());
}
+
+ //司机全责
+ if(responsibilityTypeVal == 2){
+ tOrderPrivateCar.setState(9);
+ tOrderPrivateCar.setPayMoney(BigDecimal.ZERO);
+ tOrderPrivateCar.setResponsibilityMoney(BigDecimal.ZERO);
+ }
+ //乘客全责，不做任何修改
+ if(responsibilityTypeVal == 3){
+ tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getOrderMoney());
+ }
+ //平台部分责任/司机部分责任
+ if(responsibilityTypeVal == 4 || responsibilityTypeVal == 5){
+ tOrderPrivateCar.setResponsibilityMoney(new BigDecimal(money));
+ }
+ tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
+ tOrderPrivateCar.setAbnormalStatus(2);
+ tOrderPrivateCar.setAbnormalRemark(remark);
+ tOrderPrivateCar.setAbnormalTime(new Date());
+ tOrderPrivateCarService.updateById(tOrderPrivateCar);
+
}
if(type==2){
TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
userId = tOrderCrossCity.getUserId();
tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
tOrderCrossCity.setAbnormalStatus(2);
- if(responsibilityTypeVal>3) {
- tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getOrderMoney());
- tOrderCrossCity.setOrderMoney(new BigDecimal(money));
- }
- if(responsibilityTypeVal>2){
- // 追偿订单记录表
- TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
- tAbnormalPayOrder.setOrderNum(orderNum);
-
- tAbnormalPayOrder.setOrderNo(tOrderCrossCity.getOrderNum());
- tAbnormalPayOrder.setType(2);
- tAbnormalPayOrder.setUserId(tOrderCrossCity.getUserId());
- tAbnormalPayOrder.setPayStatus(1);
- tAbnormalPayOrder.setPayTime(new Date());
- if(responsibilityTypeVal==3){
- tAbnormalPayOrder.setPayMoney(tOrderCrossCity.getPayMoney());
- }else {
- tAbnormalPayOrder.setPayMoney(new BigDecimal(money));
- }
- tAbnormalPayOrder.setCompanyId(tOrderCrossCity.getCompanyId());
- tAbnormalPayOrderService.insert(tAbnormalPayOrder);
- }
- if(responsibilityTypeVal<3){
+ //平台全责
+ if(responsibilityTypeVal == 1) {
+ tOrderCrossCity.setPayType(5);
+ tOrderCrossCity.setPayMoney(tOrderCrossCity.getOrderMoney());
tOrderCrossCity.setState(9);
+ tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getOrderMoney());
+ }
+ //司机全责
+ if(responsibilityTypeVal == 2){
+ tOrderCrossCity.setState(9);
+ tOrderCrossCity.setPayMoney(BigDecimal.ZERO);
+ tOrderCrossCity.setResponsibilityMoney(BigDecimal.ZERO);
+ }
+ //乘客全责，不做任何修改
+ if(responsibilityTypeVal == 3){
+ tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getOrderMoney());
+ }
+ //平台部分责任/司机部分责任
+ if(responsibilityTypeVal == 4 || responsibilityTypeVal == 5){
+ tOrderCrossCity.setResponsibilityMoney(new BigDecimal(money));
}
tOrderCrossCity.setAbnormalRemark(remark);
tOrderCrossCityService.updateById(tOrderCrossCity);
@@ -830,32 +822,29 @@
userId = tOrderTaxi.getUserId();
tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
tOrderTaxi.setAbnormalStatus(2);
- if(responsibilityTypeVal>3) {
+ //平台全责
+ if(responsibilityTypeVal == 1) {
+ tOrderTaxi.setPayType(5);
+ tOrderTaxi.setPayMoney(tOrderTaxi.getOrderMoney());
tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getOrderMoney());
- tOrderTaxi.setOrderMoney(new BigDecimal(money));
- }
- if(responsibilityTypeVal>2){
- // 追偿订单记录表
- TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
- tAbnormalPayOrder.setOrderNum(orderNum);
- tAbnormalPayOrder.setOrderNo(tOrderTaxi.getOrderNum());
- tAbnormalPayOrder.setType(3);
- tAbnormalPayOrder.setUserId(tOrderTaxi.getUserId());
- tAbnormalPayOrder.setPayStatus(1);
- tAbnormalPayOrder.setPayTime(new Date());
- if(responsibilityTypeVal==3){
- tAbnormalPayOrder.setPayMoney(tOrderTaxi.getPayMoney());
- }else {
- tAbnormalPayOrder.setPayMoney(new BigDecimal( money));
- }
-
- tAbnormalPayOrder.setCompanyId(tOrderTaxi.getCompanyId());
- tAbnormalPayOrderService.insert(tAbnormalPayOrder);
- }
- if(responsibilityTypeVal<3){
tOrderTaxi.setState(9);
}
+ //司机全责
+ if(responsibilityTypeVal == 2){
+ tOrderTaxi.setState(9);
+ tOrderTaxi.setPayMoney(BigDecimal.ZERO);
+ tOrderTaxi.setResponsibilityMoney(BigDecimal.ZERO);
+ }
+ //乘客全责，不做任何修改
+ if(responsibilityTypeVal == 3){
+ tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getOrderMoney());
+ }
+ //平台部分责任/司机部分责任
+ if(responsibilityTypeVal == 4 || responsibilityTypeVal == 5){
+ tOrderTaxi.setResponsibilityMoney(new BigDecimal(money));
+ }
tOrderTaxi.setAbnormalRemark(remark);
+ tOrderTaxi.setAbnormalTime(new Date());
tOrderTaxiService.updateById(tOrderTaxi);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java
index 85f12bc..93d1df2 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java
@@ -127,8 +127,8 @@
for (Map<String,Object> object : list){
// 详细数据列【封装】
shellList = new ArrayList<String>();
- if(SinataUtil.isNotEmpty(object.get("insertTime"))){
- shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("insertTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ if(SinataUtil.isNotEmpty(object.get("createTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("createTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
}else{
shellList.add("-");
}
@@ -143,8 +143,8 @@
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(object.get("payStatus"))){
- shellList.add(object.get("payStatus").toString().equals("1")?"未支付":"已支付");
+ if(SinataUtil.isNotEmpty(object.get("state"))){
+ shellList.add(object.get("state").toString().equals("7")? "待支付":"已支付");
}else{
shellList.add("-");
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java
index 2e7b2a1..0fc8764 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java
@@ -67,7 +67,6 @@
model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType());
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
- .eq("isCross", 1)
.last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
model.addAttribute("companyList", companyList);
@@ -113,19 +112,16 @@
model.addAttribute("roleType", roleType);
if (1 == roleType) {
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
- .eq("isCross", 1)
.last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
model.addAttribute("companyList", companyList);
List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
.eq("superiorId", tDispatch.getCompanyId())
- .eq("isCross", 1)
.last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
model.addAttribute("franchiseeList",franchiseeList);
}else if (2 == roleType){
List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
.eq("superiorId", shiroExtUtil.getUser().getObjectId())
- .eq("isCross", 1)
.last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
model.addAttribute("franchiseeList",franchiseeList);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
index c4e710f..e90f8a4 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
@@ -183,7 +183,6 @@
@RequestMapping(value = "/list1")
@ResponseBody
public Object list1(Long id,String driverName) {
-
return tDriverPromotionActivityService.list1(id,driverName);
}
@RequestMapping(value = "/list2")
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
index 3beceec..946aeb5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
@@ -160,11 +160,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (shiroExtUtil.getUser().getRoleType() != 1) {
- page.setRecords(null);
- } else {
- page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state));
- }
+ page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state, shiroExtUtil.getUser().getObjectId()));
return super.packForBT(page);
}
@@ -183,6 +179,7 @@
tLine.setState(1);
tLine.setInsertTime(new Date());
tLine.setInsertUserId(shiroExtUtil.getUser().getId());
+ tLine.setCompanyId(shiroExtUtil.getUser().getObjectId());
tLineService.insert(tLine);
//添加线路站点起点+终点
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 8637767..c5df5f1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -129,7 +129,8 @@
Integer rideType,
Integer abnormal,
Integer promotion,
- String promotionUser
+ String promotionUser,
+ Integer payType
) {
String beginTime = null;
String endTime = null;
@@ -140,7 +141,7 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
- orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null));
+ orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null, payType));
return super.packForBT(page);
}
@@ -160,7 +161,7 @@
Integer rideType,
Integer abnormal,
Integer promotion,
- String promotionUser, HttpServletRequest request, HttpServletResponse response) {
+ String promotionUser, Integer payType, HttpServletRequest request, HttpServletResponse response) {
try {
String beginTime = null;
String endTime = null;
@@ -199,6 +200,7 @@
shellList.add("接单车辆");
shellList.add("订单金额");
shellList.add("状态");
+ shellList.add("支付方式");
shellList.add("是否异常订单");
shellList.add("是否推广订单");
shellList.add("推广员姓名");
@@ -379,7 +381,22 @@
break;
}
}
-
+ if(SinataUtil.isNotEmpty(object.get("payType"))){
+ switch (object.get("payType").toString()){
+ case "1":
+ shellList.add("微信");
+ break;
+ case "3":
+ shellList.add("余额");
+ break;
+ case "5":
+ shellList.add("备付金");
+ break;
+ default:
+ shellList.add("-");
+ break;
+ }
+ }
if(SinataUtil.isNotEmpty(object.get("abnormal"))){
shellList.add(object.get("abnormal").toString().equals("1")?"否":"是");
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 98db265..42e4878 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -245,35 +245,44 @@
for (int i = 0; i < mapList.size(); i++) {
Map<String,Object> d=mapList.get(i);
values[i] = new String[title.length];
- values[i][0]=d.get("insertTime").toString();
- values[i][1]=d.get("originalDriver").toString();
- values[i][2]=d.get("reason").toString();
- values[i][3]=d.get("orderNum").toString();
- values[i][4]=d.get("addOrderUser").toString();
- values[i][5]=d.get("travelTime").toString();
- values[i][6]=d.get("startAddress").toString();
- values[i][7]=d.get("endAddress").toString();
- values[i][8]=d.get("originalCar").toString();
- values[i][9]=d.get("money").toString();
+ values[i][0]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
+ values[i][1]=null == d.get("originalDriver") ? "" : d.get("originalDriver").toString();
+ values[i][2]=null == d.get("reason") ? "" : d.get("reason").toString();
+ values[i][3]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
+ values[i][4]=null == d.get("addOrderUser") ? "" : d.get("addOrderUser").toString();
+ values[i][5]=null == d.get("travelTime") ? "" : d.get("travelTime").toString();
+ values[i][6]=null == d.get("startAddress") ? "" : d.get("startAddress").toString();
+ values[i][7]=null == d.get("endAddress") ? "" : d.get("endAddress").toString();
+ values[i][8]=null == d.get("originalCar") ? "" : d.get("originalCar").toString();
+ values[i][9]=null == d.get("money") ? "" : d.get("money").toString();
values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
- values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
- d.get("orderState").toString().equals("2")?"待出发":
- d.get("orderState").toString().equals("3")?"待到达预约地点":
- d.get("orderState").toString().equals("4")?"待取货":
- d.get("orderState").toString().equals("5")?"服务中":
- d.get("orderState").toString().equals("6")?"已送达":
- d.get("orderState").toString().equals("7")?"待支付":
- d.get("orderState").toString().equals("8")?"需补差价":
- d.get("orderState").toString().equals("9")?"已取货":
- d.get("orderState").toString().equals("10")?"已取消":
- d.get("orderState").toString().equals("11")?"改派中":
- d.get("orderState").toString().equals("12")?"已支付差价":"";
- values[i][13]=d.get("state").toString().equals("1")?"提交申请":
- d.get("state").toString().equals("2")?"已支付":
- d.get("state").toString().equals("3")?"已改派":
- d.get("state").toString().equals("4")?"已取消":
- d.get("state").toString().equals("5")?"已拒绝":"";
+ if(null == d.get("orderState")){
+ values[i][12]="";
+ }else{
+ values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
+ d.get("orderState").toString().equals("2")?"待出发":
+ d.get("orderState").toString().equals("3")?"待到达预约地点":
+ d.get("orderState").toString().equals("4")?"待取货":
+ d.get("orderState").toString().equals("5")?"服务中":
+ d.get("orderState").toString().equals("6")?"已送达":
+ d.get("orderState").toString().equals("7")?"待支付":
+ d.get("orderState").toString().equals("8")?"需补差价":
+ d.get("orderState").toString().equals("9")?"已取货":
+ d.get("orderState").toString().equals("10")?"已取消":
+ d.get("orderState").toString().equals("11")?"改派中":
+ d.get("orderState").toString().equals("12")?"已支付差价":"";
+ }
+ if(null == d.get("state")){
+ values[i][13]="";
+ }else{
+ values[i][13]=d.get("state").toString().equals("1")?"提交申请":
+ d.get("state").toString().equals("2")?"已支付":
+ d.get("state").toString().equals("3")?"已改派":
+ d.get("state").toString().equals("4")?"已取消":
+ d.get("state").toString().equals("5")?"已拒绝":"";
+ }
+
}
String fileNameTitle="快车改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
@@ -353,35 +362,44 @@
for (int i = 0; i < mapList.size(); i++) {
Map<String,Object> d=mapList.get(i);
values[i] = new String[title.length];
- values[i][0]=d.get("insertTime").toString();
- values[i][1]=d.get("originalDriver").toString();
- values[i][2]=d.get("reason").toString();
- values[i][3]=d.get("orderNum").toString();
- values[i][4]=d.get("addOrderUser").toString();
- values[i][5]=d.get("travelTime").toString();
- values[i][6]=d.get("startAddress").toString();
- values[i][7]=d.get("endAddress").toString();
- values[i][8]=d.get("originalCar").toString();
- values[i][9]=d.get("money").toString();
+ values[i][0]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
+ values[i][1]=null == d.get("originalDriver") ? "" : d.get("originalDriver").toString();
+ values[i][2]=null == d.get("reason") ? "" : d.get("reason").toString();
+ values[i][3]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
+ values[i][4]=null == d.get("addOrderUser") ? "" : d.get("addOrderUser").toString();
+ values[i][5]=null == d.get("travelTime") ? "" : d.get("travelTime").toString();
+ values[i][6]=null == d.get("startAddress") ? "" : d.get("startAddress").toString();
+ values[i][7]=null == d.get("endAddress") ? "" : d.get("endAddress").toString();
+ values[i][8]=null == d.get("originalCar") ? "" : d.get("originalCar").toString();
+ values[i][9]=null == d.get("money") ? "" : d.get("money").toString();
values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
- values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
- d.get("orderState").toString().equals("2")?"待出发":
- d.get("orderState").toString().equals("3")?"待到达预约地点":
- d.get("orderState").toString().equals("4")?"待取货":
- d.get("orderState").toString().equals("5")?"服务中":
- d.get("orderState").toString().equals("6")?"已送达":
- d.get("orderState").toString().equals("7")?"待支付":
- d.get("orderState").toString().equals("8")?"需补差价":
- d.get("orderState").toString().equals("9")?"已取货":
- d.get("orderState").toString().equals("10")?"已取消":
- d.get("orderState").toString().equals("11")?"改派中":
- d.get("orderState").toString().equals("12")?"已支付差价":"";
- values[i][13]=d.get("state").toString().equals("1")?"提交申请":
- d.get("state").toString().equals("2")?"已支付":
- d.get("state").toString().equals("3")?"已改派":
- d.get("state").toString().equals("4")?"已取消":
- d.get("state").toString().equals("5")?"已拒绝":"";
+ if(null == d.get("orderState")){
+ values[i][12]="";
+ }else{
+ values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
+ d.get("orderState").toString().equals("2")?"待出发":
+ d.get("orderState").toString().equals("3")?"待到达预约地点":
+ d.get("orderState").toString().equals("4")?"待取货":
+ d.get("orderState").toString().equals("5")?"服务中":
+ d.get("orderState").toString().equals("6")?"已送达":
+ d.get("orderState").toString().equals("7")?"待支付":
+ d.get("orderState").toString().equals("8")?"需补差价":
+ d.get("orderState").toString().equals("9")?"已取货":
+ d.get("orderState").toString().equals("10")?"已取消":
+ d.get("orderState").toString().equals("11")?"改派中":
+ d.get("orderState").toString().equals("12")?"已支付差价":"";
+ }
+ if(null == d.get("state")){
+ values[i][13]="";
+ }else{
+ values[i][13]=d.get("state").toString().equals("1")?"提交申请":
+ d.get("state").toString().equals("2")?"已支付":
+ d.get("state").toString().equals("3")?"已改派":
+ d.get("state").toString().equals("4")?"已取消":
+ d.get("state").toString().equals("5")?"已拒绝":"";
+ }
+
}
String fileNameTitle="快车改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
@@ -462,35 +480,44 @@
for (int i = 0; i < mapList.size(); i++) {
Map<String,Object> d=mapList.get(i);
values[i] = new String[title.length];
- values[i][0]=d.get("insertTime").toString();
- values[i][1]=d.get("originalDriver").toString();
- values[i][2]=d.get("reason").toString();
- values[i][3]=d.get("orderNum").toString();
- values[i][4]=d.get("addOrderUser").toString();
- values[i][5]=d.get("travelTime").toString();
- values[i][6]=d.get("startAddress").toString();
- values[i][7]=d.get("endAddress").toString();
- values[i][8]=d.get("originalCar").toString();
- values[i][9]=d.get("money").toString();
+ values[i][0]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
+ values[i][1]=null == d.get("originalDriver") ? "" : d.get("originalDriver").toString();
+ values[i][2]=null == d.get("reason") ? "" : d.get("reason").toString();
+ values[i][3]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
+ values[i][4]=null == d.get("addOrderUser") ? "" : d.get("addOrderUser").toString();
+ values[i][5]=null == d.get("travelTime") ? "" : d.get("travelTime").toString();
+ values[i][6]=null == d.get("startAddress") ? "" : d.get("startAddress").toString();
+ values[i][7]=null == d.get("endAddress") ? "" : d.get("endAddress").toString();
+ values[i][8]=null == d.get("originalCar") ? "" : d.get("originalCar").toString();
+ values[i][9]=null == d.get("money") ? "" : d.get("money").toString();
values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
- values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
- d.get("orderState").toString().equals("2")?"待出发":
- d.get("orderState").toString().equals("3")?"待到达预约地点":
- d.get("orderState").toString().equals("4")?"待取货":
- d.get("orderState").toString().equals("5")?"服务中":
- d.get("orderState").toString().equals("6")?"已送达":
- d.get("orderState").toString().equals("7")?"待支付":
- d.get("orderState").toString().equals("8")?"需补差价":
- d.get("orderState").toString().equals("9")?"已取货":
- d.get("orderState").toString().equals("10")?"已取消":
- d.get("orderState").toString().equals("11")?"改派中":
- d.get("orderState").toString().equals("12")?"已支付差价":"";
- values[i][13]=d.get("state").toString().equals("1")?"提交申请":
- d.get("state").toString().equals("2")?"已支付":
- d.get("state").toString().equals("3")?"已改派":
- d.get("state").toString().equals("4")?"已取消":
- d.get("state").toString().equals("5")?"已拒绝":"";
+ if(null == d.get("orderState")){
+ values[i][12]="";
+ }else{
+ values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
+ d.get("orderState").toString().equals("2")?"待出发":
+ d.get("orderState").toString().equals("3")?"待到达预约地点":
+ d.get("orderState").toString().equals("4")?"待取货":
+ d.get("orderState").toString().equals("5")?"服务中":
+ d.get("orderState").toString().equals("6")?"已送达":
+ d.get("orderState").toString().equals("7")?"待支付":
+ d.get("orderState").toString().equals("8")?"需补差价":
+ d.get("orderState").toString().equals("9")?"已取货":
+ d.get("orderState").toString().equals("10")?"已取消":
+ d.get("orderState").toString().equals("11")?"改派中":
+ d.get("orderState").toString().equals("12")?"已支付差价":"";
+ }
+ if(null == d.get("state")){
+ values[i][13]="";
+ }else{
+ values[i][13]=d.get("state").toString().equals("1")?"提交申请":
+ d.get("state").toString().equals("2")?"已支付":
+ d.get("state").toString().equals("3")?"已改派":
+ d.get("state").toString().equals("4")?"已取消":
+ d.get("state").toString().equals("5")?"已拒绝":"";
+ }
+
}
String fileNameTitle="快车改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
@@ -598,12 +625,16 @@
d.get("orderState").toString().equals("11")?"改派中":
d.get("orderState").toString().equals("12")?"已支付差价":"";
}
-
- values[i][13]=d.get("state").toString().equals("1")?"提交申请":
- d.get("state").toString().equals("2")?"已支付":
- d.get("state").toString().equals("3")?"已改派":
- d.get("state").toString().equals("4")?"已取消":
- d.get("state").toString().equals("5")?"已拒绝":"";
+ if(null == d.get("state")){
+ values[i][13]="";
+ }else{
+ values[i][13]=d.get("state").toString().equals("1")?"提交申请":
+ d.get("state").toString().equals("2")?"已支付":
+ d.get("state").toString().equals("3")?"已改派":
+ d.get("state").toString().equals("4")?"已取消":
+ d.get("state").toString().equals("5")?"已拒绝":"";
+ }
+
}
String fileNameTitle="快车改派";
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
index 4f11545..848390c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
@@ -142,11 +142,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (shiroExtUtil.getUser().getRoleType() != 1) {
- page.setRecords(null);
- } else {
- page.setRecords(tSiteService.getSiteList(page, beginTime, endTime, name, insertUser, city, state));
- }
+ page.setRecords(tSiteService.getSiteList(page, beginTime, endTime, name, insertUser, city, state, shiroExtUtil.getUser().getObjectId()));
return super.packForBT(page);
}
@@ -159,6 +155,7 @@
tSite.setInsertTime(new Date());
tSite.setInsertUserId(shiroExtUtil.getUser().getId());
tSite.setState(1);
+ tSite.setCompanyId(shiroExtUtil.getUser().getObjectId());
tSiteService.insert(tSite);
//添加站点区域
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
index 8108a00..1b15e69 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
@@ -28,7 +28,8 @@
@Param("name") String name,
@Param("insertUser") String insertUser,
@Param("modelStr") String modelStr,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ @Param("companyId") Integer companyId);
/**
* 根据线路ID查询线路价格
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
index 135a4ee..23059ba 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverRankVo;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -40,7 +41,8 @@
@Param("abnormal") Integer abnormal,
@Param("promotion") Integer promotion,
@Param("promotionUser") String promotionUser,
- @Param("abnormalStatus") Integer abnormalStatus);
+ @Param("abnormalStatus") Integer abnormalStatus,
+ @Param("payType") Integer payType);
List<Map<String,Object>> getPrivateCarOrderListExport(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@@ -74,4 +76,7 @@
List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId,@Param("activityId") Integer activityId);
List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId, @Param("activityId") Integer activityId);
+
+
+ List<DriverRankVo> getDriverPromotionActivity(@Param("id") Integer id, @Param("driverName") String driverName);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
index 6469de0..463cb96 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
@@ -28,7 +28,8 @@
@Param("name") String name,
@Param("insertUser") String insertUser,
@Param("city") String city,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ @Param("companyId") Integer companyId);
List<TSite> query(@Param("provinceCode") String provinceCode, @Param("cityCode")String cityCode,
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
index 6a1dbeb..7eebff6 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
@@ -4,14 +4,19 @@
<select id="list" resultType="java.util.Map">
- select o.id,o.createTime, o.orderNo as orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone, o.payStatus, o.payTime, o.payMoney, o.insertTime, o.companyId
- from t_abnormal_pay_order o left join t_user t2 on o.userId = t2.id
+ select o.id,o.recoveryOrderCreateDate as createTime, o.orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone,o.state,o.payMoney,o.payTime
+ from (
+ select id,userId,recoveryOrderCreateDate,orderNum,passengers,passengersPhone,state,payMoney,companyId,payTime from t_order_private_car a where recoveryOrder = 1
+ UNION all
+ select id,userId,recoveryOrderCreateDate,orderNum,passengers,passengersPhone,state,payMoney,companyId,payTime from t_order_taxi a where recoveryOrder = 1
+ ) o
+ left join t_user t2 on o.userId = t2.id
where 1=1
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ AND (o.recoveryOrderCreateDate between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
<if test="orderNum != null and orderNum != ''">
- and o.orderNo LIKE CONCAT('%',#{orderNum},'%')
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
</if>
<if test="userName != null and userName != ''">
and t2.nickName LIKE CONCAT('%',#{userName},'%')
@@ -31,10 +36,13 @@
<if test="roleType != null and roleType != '' and roleType == 3">
and o.companyId = #{nowUserId}
</if>
- <if test="null != abnormalStatus">
- and o.payStatus = #{abnormalStatus}
+ <if test="null != abnormalStatus and 1 == abnormalStatus">
+ and o.state = 7
</if>
- order by o.createTime desc
+ <if test="null != abnormalStatus and 2 == abnormalStatus">
+ and o.state in (8, 9)
+ </if>
+ order by o.recoveryOrderCreateDate desc
</select>
</mapper>
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
index 42bb400..608724e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -68,7 +68,7 @@
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
- LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
+ LEFT JOIN (select * from t_driver where flag != 3 and id in (select driverId from t_driver_work where state = 1)) AS dd on dd.carId = cc.id) as o
<where>
o.state = 1
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 9084561..a7cce8b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -137,13 +137,14 @@
<!--根据审核通过的司机列表-->
<select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
+ SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
(IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,
dd.* from t_driver as dd
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
+ LEFT JOIN (select * from t_driver_work where state = 1) as dw on dd.id = dw.driverId
LEFT JOIN (
SELECT
GROUP_CONCAT(case when type = 1 then '快车'
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
index 52db9f7..20954a2 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
@@ -45,6 +45,9 @@
<if test="state != null and state != ''">
and o.state = #{state}
</if>
+ <if test="companyId != null">
+ and o.companyId = #{companyId}
+ </if>
</where>
order by o.id desc
</select>
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 761e58c..200f40c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -166,6 +166,9 @@
<if test="orderSource != null and orderSource != ''">
and o.orderSource = #{orderSource}
</if>
+ <if test="payType != null">
+ and o.payType = #{payType}
+ </if>
<if test="userName != null and userName != ''">
and o.userName LIKE CONCAT('%',#{userName},'%')
</if>
@@ -464,4 +467,43 @@
) as t5 order by t5.successTime desc
</select>
+
+ <select id="getDriverPromotionActivity" resultType="com.stylefeng.guns.modular.system.model.DriverRankVo">
+ select *
+ from (select aa.id as driverId,
+ aa.`name` as driverName,
+ COUNT(aa.userId) as userNum,
+ SUM(aa.promotionMoney) as money,
+ aa.promotionActivityId as activityId
+ from (select b.id, b.`name`, a.userId, a.promotionMoney, a.promotionActivityId
+ from t_order_private_car a
+ left join t_driver b on (a.promotionDriverId = b.id)
+ where a.successTime is not null and a.promotionActivityId = #{id}
+ <if test="null != driverName and '' != driverName">
+ and b.`name` like concat('%', #{driverName}, '%')
+ </if>
+
+ UNION ALL
+
+ select b.id, b.`name`, a.userId, a.promotionMoney, a.promotionActivityId
+ from t_order_taxi a
+ left join t_driver b on (a.promotionDriverId = b.id)
+ where a.successTime is not null and a.promotionActivityId = #{id}
+ <if test="null != driverName and '' != driverName">
+ and b.`name` like concat('%', #{driverName}, '%')
+ </if>
+
+ UNION ALL
+
+ select b.id, b.`name`, a.userId, a.promotionMoney, a.promotionActivityId
+ from t_order_cross_city a
+ left join t_driver b on (a.promotionDriverId = b.id)
+ where a.successTime is not null and a.promotionActivityId = #{id}
+ <if test="null != driverName and '' != driverName">
+ and b.`name` like concat('%', #{driverName}, '%')
+ </if>
+ ) as aa
+ group by aa.id) as datas
+ order by datas.userNum desc
+ </select>
</mapper>
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
index 8749905..b329b7d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
@@ -44,6 +44,9 @@
<if test="state != null and state != ''">
and o.state = #{state}
</if>
+ <if test="null != companyId">
+ and o.companyId = #{companyId}
+ </if>
</where>
order by o.id desc
</select>
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
index c802371..d7b4c09 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
@@ -53,6 +53,7 @@
*/
private Integer insertUserId;
private String outSetting;
+ private Integer companyId;
public Integer getInsertUserId() {
return insertUserId;
@@ -110,6 +111,22 @@
this.insertTime = insertTime;
}
+ public String getOutSetting() {
+ return outSetting;
+ }
+
+ public void setOutSetting(String outSetting) {
+ this.outSetting = outSetting;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 24a1fec..6f635ed 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -355,6 +355,8 @@
private Date voiceTime;
+ private Date abnormalTime;
+
/**
* 是否异常订单 1否 2是
*/
@@ -1254,6 +1256,14 @@
this.promotionActivityId = promotionActivityId;
}
+ public Date getAbnormalTime() {
+ return abnormalTime;
+ }
+
+ public void setAbnormalTime(Date abnormalTime) {
+ this.abnormalTime = abnormalTime;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
index a59d96a..2ed66d6 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -317,6 +317,8 @@
private Date voiceTime;
+ private Date abnormalTime;
+
public String getVoice() {
return voice;
}
@@ -942,6 +944,14 @@
this.contactPersonPhone = contactPersonPhone;
}
+ public Date getAbnormalTime() {
+ return abnormalTime;
+ }
+
+ public void setAbnormalTime(Date abnormalTime) {
+ this.abnormalTime = abnormalTime;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
index 6427c01..ac03772 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
@@ -65,6 +65,10 @@
* 添加人id
*/
private Integer insertUserId;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
public Integer getId() {
@@ -155,6 +159,14 @@
this.insertUserId = insertUserId;
}
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
index afb0bd6..46e9aaa 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
@@ -28,7 +28,8 @@
@Param("name") String name,
@Param("insertUser") String insertUser,
@Param("modelStr") String modelStr,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ @Param("companyId") Integer companyId);
/**
* 根据线路ID查询线路价格
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
index d2110fc..ed17516 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverRankVo;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.baomidou.mybatisplus.service.IService;
import org.apache.ibatis.annotations.Param;
@@ -40,7 +41,8 @@
Integer abnormal,
Integer promotion,
String promotionUser,
- Integer abnormalStatus);
+ Integer abnormalStatus,
+ Integer payType);
List<Map<String,Object>> getPrivateCarOrderListExport(@Param("page") Page<Map<String, Object>> page,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@@ -75,4 +77,14 @@
List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);
+
+
+ /**
+ * 根据推广活动id获取推广汇总数据
+ * @param id
+ * @param driverName
+ * @return
+ */
+ List<DriverRankVo> getDriverPromotionActivity(Integer id, String driverName);
+
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
index 88e38ca..5a7de7e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
@@ -28,7 +28,8 @@
@Param("name") String name,
@Param("insertUser") String insertUser,
@Param("city") String city,
- @Param("state") Integer state);
+ @Param("state") Integer state,
+ @Param("companyId") Integer companyId);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
index 9395687..0376aa0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.system.UserInfo;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.dao.TDriverPromotionActivityMapper;
import com.stylefeng.guns.modular.system.service.*;
@@ -44,43 +45,8 @@
@Override
public List<DriverRankVo> list1(Long id, String driverName) {
- List<DriverRankVo> hashMaps = new ArrayList<>();
-
- // 获取所有的司机
- Wrapper<TDriver> flag = new EntityWrapper<TDriver>().ne("flag", 3);
- if (driverName != null && !"".equals(driverName)) {
- flag.like("name", driverName);
- }
-
- List<TDriver> tDrivers = driverService.selectList(flag);
-
- // 获取绑定的司机的用户
- List<TUser> tUsers = userService.selectList(new EntityWrapper<TUser>().isNotNull("bindDriverId").gt("bindExpireDate", new Date()));
-
- // 获取所有获得司机收益的订单
- List<TOrderPrivateCar> tOrderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("promotionActivityId",id).isNotNull("promotionDriverId").isNotNull("successTime"));
- List<TOrderTaxi> tOrderTaxis = orderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("promotionActivityId",id).isNotNull("promotionDriverId").isNotNull("successTime"));
- List<TOrderCrossCity> tOrderCrossCities = orderCrossCityService.selectList(new EntityWrapper<TOrderCrossCity>().eq("promotionActivityId",id).isNotNull("promotionDriverId").isNotNull("successTime"));
-
-
- for (TDriver tDriver : tDrivers) {
- DriverRankVo driverRankVo = new DriverRankVo();
- driverRankVo.setActivityId(id);
- driverRankVo.setDriverId(tDriver.getId());
- driverRankVo.setDriverName(tDriver.getName());
- long count = tUsers.stream().filter(e -> tDriver.getId().equals(e.getBindDriverId())).count();
- driverRankVo.setUserNum((int) count);
-
- BigDecimal reduce = tOrderPrivateCars.stream().filter(e -> tDriver.getId().equals(e.getPromotionDriverId())).map(TOrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce1 = tOrderTaxis.stream().filter(e -> tDriver.getId().equals(e.getPromotionDriverId())).map(TOrderTaxi::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce2 = tOrderCrossCities.stream().filter(e -> tDriver.getId().equals(e.getPromotionDriverId())).map(TOrderCrossCity::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- driverRankVo.setMoney(reduce.add(reduce1).add(reduce2));
- hashMaps.add(driverRankVo);
- }
-// hashMaps.stream().sorted(Comparator.comparing(e -> Integer.valueOf(e.get("userNum").toString())).reversed()).collect(Collectors.toList())
- // hashMaps 通过userNUm 倒叙
- List<DriverRankVo> collect = hashMaps.stream().sorted(Comparator.comparing(DriverRankVo::getUserNum).reversed()).collect(Collectors.toList());
- return collect;
+ List<DriverRankVo> driverPromotionActivity = orderPrivateCarService.getDriverPromotionActivity(id.intValue(), driverName);
+ return driverPromotionActivity;
}
@Override
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
index 14b72b8..3dd5d8a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
@@ -22,8 +22,9 @@
public class TLineServiceImpl extends ServiceImpl<TLineMapper, TLine> implements ITLineService {
@Override
- public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String modelStr, Integer state) {
- return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state);
+ public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,
+ String insertUser, String modelStr, Integer state, Integer companyId) {
+ return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state, companyId);
}
@Override
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
index 76e01bb..b12e901 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.DriverRankVo;
import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.stylefeng.guns.modular.system.dao.TOrderPrivateCarMapper;
@@ -44,8 +45,9 @@
String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal,
Integer promotion,
String promotionUser,
- Integer abnormalStatus) {
- List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus);
+ Integer abnormalStatus,
+ Integer payType) {
+ List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, payType);
for (Map<String, Object> map : privateCarOrderList) {
if(null == map.get("serverCarModelName")){
JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString());
@@ -123,4 +125,11 @@
public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
}
+
+ @Override
+ public List<DriverRankVo> getDriverPromotionActivity(Integer id, String driverName) {
+ return this.baseMapper.getDriverPromotionActivity(id, driverName);
+ }
+
+
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
index 49d458c..a64e4aa 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
@@ -26,8 +26,9 @@
private TSiteMapper siteMapper;
@Override
- public List<Map<String, Object>> getSiteList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String city, Integer state) {
- return this.baseMapper.getSiteList(page, beginTime, endTime, name, insertUser, city, state);
+ public List<Map<String, Object>> getSiteList(Page<Map<String, Object>> page, String beginTime, String endTime,
+ String name, String insertUser, String city, Integer state, Integer companyId) {
+ return this.baseMapper.getSiteList(page, beginTime, endTime, name, insertUser, city, state, companyId);
}
@Override
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index b16392a..7d4447d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -528,9 +528,9 @@
tradePayOffData.setPaymentInfos(paymentInfoRequests);
List<GoodsInfo> goodsInfo = new ArrayList<>();
GoodsInfo goodsInfo1 = new GoodsInfo();
- goodsInfo1.setMerchantCode("B00000905");
- goodsInfo1.setCustId("CB0000004686");
- goodsInfo1.setCustName("证联消费平台交易客户");
+ goodsInfo1.setMerchantCode("prod".equals(qianYunTongConfig.getActiveProfile()) ? "B00001404" : "B00000905");
+ goodsInfo1.setCustId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "CB0000004853" : "CB0000004686");
+ goodsInfo1.setCustName("prod".equals(qianYunTongConfig.getActiveProfile()) ? "黔南云码通数字产业运营有限公司" : "证联消费平台交易客户");
goodsInfo1.setBusinessType("10408");
goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681");
goodsInfo1.setProfitSharing("1");
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
index 3758eab..bf8db42 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -218,8 +218,52 @@
}
return true;
}
-
+
+
+
+ /**
+ * 实名认证
+ * @param realName
+ * @param cardNo
+ * @return
+ */
+ public static Boolean idCardAuth(String realName, String cardNo) {
+ //请求路径
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/idCardAuth";
+ //私钥文件
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
+ //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
+ String appKey = qianYunTongConfig.getAppkey();//appkey
+ Map<String, String> headers = new HashMap<>();
+ headers.put("Content-Type", "application/json");
+ Map<String, Object> contentMap = new HashMap<String, Object>();
+ Date nowdate = new Date();
+ SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
+
+ String timeStamp = date.format(nowdate);
+ String messageId = UUID.randomUUID().toString().replaceAll("-", "");
+ contentMap.put(SystemParameterNames.getAppKey(), appKey);
+ contentMap.put(SystemParameterNames.getMessage_id(), messageId);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
+ Map<String, String> map = new HashMap<>();
+ map.put("realName", realName);
+ map.put("cardNo", cardNo);
+ contentMap.put("content", JSON.toJSONString(map));
+ log.info("【身份证实名认证】请求地址:" + url);
+ log.info("【身份证实名认证】请求参数:" + JSON.toJSONString(contentMap));
+ String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
+ log.info("【身份证实名认证】请求结果:" + result);
+ JSONObject jsonObject = JSON.parseObject(result);
+ String retCode = jsonObject.getString("retCode");
+ if (!"0".equals(retCode)) {
+ log.error("【身份证实名认证】请求失败:" + result);
+ throw new RuntimeException("【身份证实名认证】请求失败:" + result);
+ }
+ JSONObject object = jsonObject.getJSONObject("object");
+ return object.getBoolean("isok");
+ }
public static void main(String[] args) {
List<QYTUserInfo> userInfoByPhone = getUserInfoByPhone("13688394165", "981100006318563");
diff --git a/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml b/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
index a3a5996..1822ad4 100644
--- a/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
---
spring:
datasource:
- url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 123456
db-name: qyttravel #用来搜集数据库的所有表
@@ -56,7 +56,7 @@
spring:
data:
mongodb:
- uri: mongodb://192.168.110.80:27017/traveling_track
+ uri: mongodb://127.0.0.1:27017/traveling_track
---
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html
index 507ff74..b28d775 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html
@@ -277,7 +277,7 @@
<!-- 处理备注区域 -->
<div class="section-title" style="margin-top:32px;">处理备注</div>
- <textarea name="handleRemark" rows="4" style="width:90%;max-width:900px;min-width:300px;padding:10px;font-size:15px;border:1px solid #ccc;border-radius:4px;resize:vertical;"></textarea>
+ <textarea name="handleRemark" rows="4" style="width:90%;max-width:900px;min-width:300px;padding:10px;font-size:15px;border:1px solid #ccc;border-radius:4px;resize:vertical;">${item.abnormalRemark}</textarea>
<div id="action-btns">
<button id="saveBtn" class="action-btn" onclick="save()" style="display:none;">确认处理</button>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
index e5d090f..ac08b76 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -20,6 +20,7 @@
<#input id="principalName" name="联系人" />
<#input id="principalPhone" name="联系电话" />
+ <#input id="identifier" name="统一社会信用代码" />
</div>
</div>
<div class="row">
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
index d6556a1..1682a1f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -12,6 +12,7 @@
<#label id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
<#label id="principalName" name="联系人" value="${item.principalName}"/>
<#label id="principalPhone" name="联系电话" value="${item.principalPhone}"/>
+ <#label id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
</div>
</div>
<div class="row">
@@ -21,37 +22,32 @@
<div class="col-sm-9">
<fieldset>
<div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1==
- item.isSpe ? 'checked=checked' : ''} >
+ <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} >
<label for="checkbox1">
快车
</label>
<fieldset>
<div class="row" style="display: none;" id="zcDiv">
- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
- clickFun="TLineInfoDlg.set2('Spe')"/>
+ <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/>
<textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>
</div>
</fieldset>
</div>
<div class="checkbox checkbox-primary">
- <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1==
- item.isTaxi ? 'checked=checked' : ''}>
+ <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1== item.isTaxi ? 'checked=checked' : ''}>
<label for="checkbox2">
出租车
</label>
<fieldset>
<div class="row" style="display: none;" id="czDiv">
- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
- clickFun="TLineInfoDlg.set2('Taxi')"/>
+ <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('Taxi')"/>
<textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}">${item.Taxi}</textarea>
</div>
</fieldset>
</div>
<div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1==
- item.isCross ? 'checked=checked' : ''} >
+ <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1== item.isCross ? 'checked=checked' : ''} >
<label for="checkbox3">
跨城出行
</label>
@@ -97,15 +93,13 @@
<!-- <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}" >${item.OnCall}</textarea>-->
<!-- </div>-->
<div class="checkbox checkbox-success">
- <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
- type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''} >
+ <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()" type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''} >
<label for="checkbox8">
顺风车
</label>
</div>
<div class="checkbox checkbox-success">
- <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
- type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
+ <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()" type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
<label for="checkbox9">
代驾
</label>
@@ -119,13 +113,11 @@
<label class="col-sm-3 control-label">是否需要摆渡车：</label>
<div class="col-sm-9" style="display: flex;align-items: center;">
<div class="radio radio-info radio-inline">
- <input type="radio" disabled id="isNeedFerry1" value="1" name="isNeedFerry" ${1==
- item.isNeedFerry ? 'checked=checked' : ''} >
+ <input type="radio" disabled id="isNeedFerry1" value="1" name="isNeedFerry" ${1== item.isNeedFerry ? 'checked=checked' : ''} >
<label for="isNeedFerry1"> 是 </label>
</div>
<div class="radio radio-success radio-inline">
- <input type="radio" disabled id="isNeedFerry2" value="2" name="isNeedFerry" ${2==
- item.isNeedFerry ? 'checked=checked' : ''}>
+ <input type="radio" disabled id="isNeedFerry2" value="2" name="isNeedFerry" ${2== item.isNeedFerry ? 'checked=checked' : ''}>
<label for="isNeedFerry2"> 否 </label>
</div>
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
index a1b15d5..70172f8 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -8,169 +8,164 @@
<div class="col-sm-10">
@if(roleType == 1){
<#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
- <option value="">选择所属分公司</option>
- @for(obj in companyList){
- <option value="${obj.id}" ${obj.id== item.superiorId ?
- 'selected=selected' : ''}>${obj.name}</option>
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}" ${obj.id== item.superiorId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}else if(roleType == 2){
+ <#label id="companyName" name="所属分公司" value="${company.name}"/>
@}
- </
- #select>
- @}else if(roleType == 2){
- <#label id="companyName" name="所属分公司" value="${company.name}"/>
- @}
- <#input id="name" name="加盟商名称" value="${item.name}"/>
- <#input id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
- <#input id="principalName" name="联系人" value="${item.principalName}"/>
- <#input id="principalPhone" name="联系电话" value="${item.principalPhone}" />
- </div>
- </div>
- <div class="row">
- <div class="col-sm-10">
- <div class="form-group">
- <label class="col-sm-3 control-label">经营业务：</label>
- <div class="col-sm-9">
- <fieldset>
- <div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
- 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
- <label for="checkbox1">
- 快车
- </label>
- <fieldset>
- <div class="row" style="display: none;" id="zcDiv">
- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
- clickFun="TLineInfoDlg.set1('Spe')"/>
- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>
- </div>
- </fieldset>
- </div>
- <div class="checkbox checkbox-primary">
- <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
- 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
- <label for="checkbox2">
- 出租车
- </label>
- <fieldset>
- <div class="row" style="display: none;" id="czDiv">
- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
- clickFun="TLineInfoDlg.set1('Taxi')"/>
- <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}">${item.Taxi}</textarea>
- </div>
- </fieldset>
- </div>
- <div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
- 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
- <label for="checkbox3">
- 跨城出行
- </label>
- </div>
- <!-- <div class="checkbox checkbox-info">-->
- <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">-->
- <!-- <label for="checkbox4">-->
- <!-- 同城小件物流-->
- <!-- </label>-->
- <!-- <fieldset>-->
- <!-- <div class="row" style="display: none;" id="tcxDiv">-->
- <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('SameLogistics')"/>-->
- <!-- <textarea id="SameLogistics" rows="5" cols="50" hidden="hidden" value="${item.SameLogistics}" >${item.SameLogistics}</textarea>-->
- <!-- </div>-->
- <!-- </fieldset>-->
- <!-- </div>-->
- <!-- <div class="checkbox checkbox-warning">-->
- <!-- <input name="checkbox" id="checkbox5" type="checkbox" value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox5()">-->
- <!-- <label for="checkbox5">-->
- <!-- 跨城小件物流-->
- <!-- </label>-->
- <!-- <fieldset>-->
- <!-- <div class="row" style="display: none;" id="kcxDiv">-->
- <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('CrossLogistics')"/>-->
- <!-- <textarea id="CrossLogistics" rows="5" cols="50" hidden="hidden" value="${item.CrossLogistics}" >${item.CrossLogistics}</textarea>-->
- <!-- </div>-->
- <!-- </fieldset>-->
- <!-- </div>-->
- <!-- <div class="checkbox checkbox-danger">-->
- <!-- <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox6()">-->
- <!-- <label for="checkbox6">-->
- <!-- 包车-->
- <!-- </label>-->
- <!-- </div>-->
- <!-- <div class="checkbox checkbox-warning">-->
- <!-- <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox7()">-->
- <!-- <label for="checkbox7">-->
- <!-- 95128电召-->
- <!-- </label>-->
- <!-- <fieldset>-->
- <!-- <div class="row" style="display: none;" id="dcxDiv">-->
- <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('OnCall')"/>-->
- <!-- <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}" >${item.OnCall}</textarea>-->
- <!-- </div>-->
- <!-- </fieldset>-->
- <!-- </div>-->
- <div class="checkbox checkbox-success">
- <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
- type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''} >
- <label for="checkbox8">
- 顺风车
- </label>
- </div>
- <div class="checkbox checkbox-success">
- <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
- type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
- <label for="checkbox9">
- 代驾
- </label>
- </div>
- </fieldset>
- </div>
+ <#input id="name" name="加盟商名称" value="${item.name}"/>
+ <#input id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
+ <#input id="principalName" name="联系人" value="${item.principalName}"/>
+ <#input id="principalPhone" name="联系电话" value="${item.principalPhone}" />
+ <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否需要摆渡车：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- <div class="radio radio-info radio-inline">
- <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1== item.isNeedFerry ?
- 'checked=checked' : ''} >
- <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 快车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>
+ <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
+ clickFun="TLineInfoDlg.set1('Taxi')"/>
+ <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}">${item.Taxi}</textarea>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <!-- <div class="checkbox checkbox-info">-->
+ <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">-->
+ <!-- <label for="checkbox4">-->
+ <!-- 同城小件物流-->
+ <!-- </label>-->
+ <!-- <fieldset>-->
+ <!-- <div class="row" style="display: none;" id="tcxDiv">-->
+ <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('SameLogistics')"/>-->
+ <!-- <textarea id="SameLogistics" rows="5" cols="50" hidden="hidden" value="${item.SameLogistics}" >${item.SameLogistics}</textarea>-->
+ <!-- </div>-->
+ <!-- </fieldset>-->
+ <!-- </div>-->
+ <!-- <div class="checkbox checkbox-warning">-->
+ <!-- <input name="checkbox" id="checkbox5" type="checkbox" value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox5()">-->
+ <!-- <label for="checkbox5">-->
+ <!-- 跨城小件物流-->
+ <!-- </label>-->
+ <!-- <fieldset>-->
+ <!-- <div class="row" style="display: none;" id="kcxDiv">-->
+ <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('CrossLogistics')"/>-->
+ <!-- <textarea id="CrossLogistics" rows="5" cols="50" hidden="hidden" value="${item.CrossLogistics}" >${item.CrossLogistics}</textarea>-->
+ <!-- </div>-->
+ <!-- </fieldset>-->
+ <!-- </div>-->
+ <!-- <div class="checkbox checkbox-danger">-->
+ <!-- <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox6()">-->
+ <!-- <label for="checkbox6">-->
+ <!-- 包车-->
+ <!-- </label>-->
+ <!-- </div>-->
+ <!-- <div class="checkbox checkbox-warning">-->
+ <!-- <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isOnCall ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox7()">-->
+ <!-- <label for="checkbox7">-->
+ <!-- 95128电召-->
+ <!-- </label>-->
+ <!-- <fieldset>-->
+ <!-- <div class="row" style="display: none;" id="dcxDiv">-->
+ <!-- <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('OnCall')"/>-->
+ <!-- <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}" >${item.OnCall}</textarea>-->
+ <!-- </div>-->
+ <!-- </fieldset>-->
+ <!-- </div>-->
+ <div class="checkbox checkbox-success">
+ <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
+ type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''} >
+ <label for="checkbox8">
+ 顺风车
+ </label>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
+ type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
+ <label for="checkbox9">
+ 代驾
+ </label>
+ </div>
+ </fieldset>
</div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2== item.isNeedFerry ?
- 'checked=checked' : ''}>
- <label for="isNeedFerry2"> 否 </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1== item.isNeedFerry ?
+ 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2== item.isNeedFerry ?
+ 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}"
+ readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword">
</div>
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">登录账号：</label>
- <div class="col-sm-9">
- <input type="text" class="form-control" id="account" name="account" value="${user.account}"
- readonly>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">登录密码：</label>
- <div class="col-sm-9">
- <input type="password" class="form-control" id="password" name="password">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">确认密码：</label>
- <div class="col-sm-9">
- <input type="password" class="form-control" id="rePassword" name="rePassword">
- </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="FranchiseeInfoDlg.updateFranchisee()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
- </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="FranchiseeInfoDlg.updateFranchisee()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
</div>
<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index 2920ac8..889a627 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -45,7 +45,26 @@
@}
</div>
</div>
-
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">从业地：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <#select id="provinceId" name="省：" onchange="YesDriverInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}" tag="${province.code}">${province.name}</option>
+ @}
+ </#select>
+
+ <#select id="cityId" name="市：" onchange="YesDriverInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ </#select>
+
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ </#select>
+ </div>
+ </div>
<#avatar id="headImgUrl" name="头像：" />
<#avatar id="faceImgUrl" name="人脸识别照片：" />
<!--<#input id="phone" name="手机号" />-->
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 15148a3..fa6d15b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -45,7 +45,35 @@
@}
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label">从业地：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <#select id="provinceId" name="从业地：" onchange="YesDriverInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}" tag="${province.code}" ${province.id == provinceId ? 'selected=selected' : ''}>${province.name}</option>
+ @}
+ </#select>
+
+ <#select id="cityId" name="市：" onchange="YesDriverInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ @if(isNotEmpty(cityList)){
+ @for(city in cityList){
+ <option value="${city.id}" tag="${city.code}" ${city.id == cityId ? 'selected=selected' : ''}>${city.name}</option>
+ @}
+ @}
+ </#select>
+
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ @if(isNotEmpty(areaList)){
+ @for(area in areaList){
+ <option value="${area.id}" tag="${area.code}" ${area.id == areaId ? 'selected=selected' : ''}>${area.name}</option>
+ @}
+ @}
+ </#select>
+ </div>
+ </div>
<#avatar id="headImgUrl" name="头像：" avatarImg="${item.headImgUrl}"/>
<#avatar id="faceImgUrl" name="人脸识别照片：" avatarImg="${item.faceImgUrl}"/>
<!--<#input id="phone" name="手机号" value="${item.phone}"/>-->
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
index 4aa90ce..240ff7f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -73,7 +73,14 @@
<option value="3">拼车订单</option>
</#SelectCon>
</div>
-
+ <div class="col-sm-3">
+ <#SelectCon id="payType" name="支付方式" >
+ <option value="">全部</option>
+ <option value="1">微信</option>
+ <option value="3">余额</option>
+ <option value="5">备付金</option>
+ </#SelectCon>
+ </div>
<div class="col-sm-3">
<#SelectCon id="abnormal" name="是否异常订单" >
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
index 16a4d1e..f66f937 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -145,7 +145,7 @@
<#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
<#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
- @if(isNotEmpty(item.payMoney)){
+ @if(isNotEmpty(item.payType)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
@}else{
<#label id="payMoney" name="实际支付费用" value=" 元"/>
@@ -239,7 +239,10 @@
<h6 class="h3Class" style="font-weight: 700;">修改订单价格为：</h6>
</div>
<div class="col-sm-1">
- <h6 class="h3Class" style="margin-left: 10%">${item.payMoney}</h4>
+ @if(isNotEmpty(item.responsibilityType)){
+ <h6 class="h3Class" style="margin-left: 10%">${item.responsibilityMoney}</h4>
+ @}
+
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
index 1fdf1c1..74dcd5a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -174,7 +174,10 @@
<h6 class="h3Class" style="font-weight: 700;">修改订单价格为：</h6>
</div>
<div class="col-sm-1">
- <h6 class="h3Class" style="margin-left: 10%">${item.payMoney}</h4>
+ @if(isNotEmpty(item.responsibilityType)){
+ <h6 class="h3Class" style="margin-left: 10%">${item.responsibilityMoney}</h4>
+ @}
+
</div>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js
index c2d7fe9..826ce8f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js
@@ -396,15 +396,15 @@
var kuahceng = order.kuahceng;
var o = '';
$('#order').html(o);
- // var zc = '<div class="list-group"><a href="#" class="list-group-item active">快车未接订单</a>'
- // for(var i in zhuanche){
- // zc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + zhuanche[i].start + '</p><p class="list-group-item-text">终点：' + zhuanche[i].end + '</p>' +
- // '<p class="list-group-item-text">下单时间：' + zhuanche[i].travelTime + '</p><p class="list-group-item-text">车型：' + zhuanche[i].carModel + '</p>' +
- // '<p class="list-group-item-text">人数：' + zhuanche[i].num + '</p></a>';
- // }
- // zc += '</div>';
- // o += zc;
- //
+ var zc = '<div class="list-group"><a href="#" class="list-group-item active">快车未接订单</a>'
+ for(var i in zhuanche){
+ zc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + zhuanche[i].start + '</p><p class="list-group-item-text">终点：' + zhuanche[i].end + '</p>' +
+ '<p class="list-group-item-text">下单时间：' + zhuanche[i].travelTime + '</p><p class="list-group-item-text">车型：' + zhuanche[i].carModel + '</p>' +
+ '<p class="list-group-item-text">人数：' + zhuanche[i].num + '</p></a>';
+ }
+ zc += '</div>';
+ o += zc;
+
// var kc = '<div class="list-group"><a href="#" class="list-group-item active">跨城出行未接订单</a>'
// for(var i in kuacheng){
// kc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuacheng[i].start + '</p><p class="list-group-item-text">终点：' + kuacheng[i].end + '</p>' +
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js
index ef9c653..ca2bbf9 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js
@@ -36,9 +36,9 @@
},
{title: '支付金额', field: 'payMoney', visible: true, align: 'center', valign: 'middle',
},
- {title: '支付状态', field: 'payStatus', visible: true, align: 'center', valign: 'middle',
+ {title: '支付状态', field: 'state', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- return {1: '未支付', 2: '已支付'}[value];
+ return value == 7 ? "待支付":"已支付";
}
},
{title: '支付时间', field: 'payTime', visible: true, align: 'center', valign: 'middle',width:'10%',
@@ -51,7 +51,6 @@
return btn;
}
},
- {title: '用户id', field: 'userId', visible: false, align: 'center', valign: 'middle'},
{title: '用户昵称', field: 'userName', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var btn = "";
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
index 7abb2e2..22845cc 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
@@ -19,6 +19,17 @@
}
}
},
+ identifier: {
+ validators: {
+ notEmpty: {
+ message: '统一社会信用代码不能为空'
+ },
+ regexp: {
+ regexp: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/i,
+ message: '统一社会信用代码格式不正确'
+ }
+ }
+ },
account: {
validators: {
notEmpty: {
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index b2494d0..086d4f4 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -404,7 +404,11 @@
}
}
}
-
+ var areaValue = $("#areaId option:selected").attr("tag");
+ if(null == areaValue || "" == areaValue){
+ Feng.info("请选择司机从业地");
+ return;
+ }
var sex = $("input[name='sex']:checked").val();
var headImgUrl = $("#headImgUrl").val();
if ("" == headImgUrl){
@@ -465,7 +469,7 @@
window.parent.YesDriver.table.refresh();
YesDriverInfoDlg.close();
}else{
- Feng.error("添加失败!" + data.message + "!");
+ Feng.error("添加失败!" + data + "!");
}
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
@@ -475,6 +479,7 @@
ajax.set("lineStr",JSON.stringify(subArr));
ajax.set("sex",sex);
ajax.set("roleType",roleType);
+ ajax.set("placeOfEmployment",areaValue);
if (1 == roleType){
ajax.set("companyType",companyType);
ajax.set("oneId",$("#oneId").val());
@@ -514,6 +519,11 @@
return;
}
}
+ }
+ var areaValue = $("#areaId option:selected").attr("tag");
+ if(null == areaValue || "" == areaValue){
+ Feng.info("请选择司机从业地");
+ return;
}
var sex = $("input[name='sex']:checked").val();
var headImgUrl = $("#headImgUrl").val();
@@ -570,9 +580,13 @@
Feng.error("登录账户已存在,请重新输入");
return;
}
- Feng.success("修改成功!");
- window.parent.YesDriver.table.refresh();
- YesDriverInfoDlg.close();
+ if(200 == data.code){
+ Feng.success("修改成功!");
+ window.parent.YesDriver.table.refresh();
+ YesDriverInfoDlg.close();
+ }else{
+ Feng.error("修改失败!" + data + "!");
+ }
},function(data){
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
@@ -581,6 +595,7 @@
ajax.set("lineStr",JSON.stringify(subArr));
ajax.set("sex",sex);
ajax.set("roleType",roleType);
+ ajax.set("placeOfEmployment",areaValue);
if (1 == roleType){
ajax.set("companyType",companyType);
ajax.set("oneId",$("#oneId").val());
@@ -600,6 +615,45 @@
ajax.start();
}
+
+
+/**
+ * 省改变时执行
+ */
+YesDriverInfoDlg.provinceChange = function () {
+ var provinceId = $("#provinceId").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+"' tag='" + v.code + "'>"+v.name+"</option>";
+ });
+ $("#cityId").empty().append(content);
+ $("#areaId").empty().append('<option value="">选择区</option>');
+ }
+ });
+ ajax.set("id",provinceId);
+ ajax.start();
+}
+/**
+ * 市改变时执行
+ */
+YesDriverInfoDlg.cityChange = function () {
+ var cityId = $("#cityId").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+"' tag='" + v.code + "'>"+v.name+"</option>";
+ });
+ $("#areaId").empty().append(content);
+ }
+ });
+ ajax.set("id",cityId);
+ ajax.start();
+}
+
+
$(function() {
Feng.initValidator("yesDriverInfoForm", YesDriverInfoDlg.validateFields);
// 初始化图片上传
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index 1af00d7..db9a017 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -226,6 +226,21 @@
return btn;
}
},
+ {title: '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.payType != '' && row.payType != null) {
+ if (row.payType == 1){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="微信" onfocus="TUser.tooltip()">微信</p>']
+ } else if (row.payType == 3){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="余额" onfocus="TUser.tooltip()">余额</p>']
+ } else if (row.payType == 5){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="备付金" onfocus="TUser.tooltip()">备付金</p>']
+ }
+ }
+ return btn;
+ }
+ },
{title: '是否异常订单', field: 'abnormal', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
return {1:"否",2:"是"}[value];
@@ -407,6 +422,7 @@
queryData['promotionUser'] = $("#promotionUser").val();
queryData['abnormal'] = $("#abnormal").val();
queryData['promotion'] = $("#promotion").val();
+ queryData['payType'] = $("#payType").val();
TOrderPrivateCar.table.refresh({query: queryData});
};
@@ -428,6 +444,7 @@
let promotionUser = $('#promotionUser').val();
let abnormal = $('#abnormal').val();
let promotion = $('#promotion').val();
+ let payType = $('#payType').val();
if(null != insertTime && '' != insertTime){
p += "insertTime=" + insertTime + "&";
}
@@ -470,6 +487,9 @@
if(null != promotion && '' != promotion){
p += "promotion=" + promotion + "&" ;
}
+ if(null != payType && '' != payType){
+ p += "payType=" + payType + "&" ;
+ }
if('' != p){
p = "?" + p.substring(0, p.length - 1);
}
@@ -493,6 +513,7 @@
$("#promotionUser").val("");
$("#abnormal").val("");
$("#promotion").val("");
+ $("#payType").val("");
TOrderPrivateCar.search();
};
--
Gitblit v1.7.1