From 9a90c54482b0746ce0853400b4dfdf00799621df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:02:34 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 1 -
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 3 +--
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 23 +++++++++++++++++++----
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index d46fcdc..a648d3d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -592,8 +592,7 @@
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("type",1)
- .eq("userType", 2)
- .between("insertTime", start, end);
+ .eq("userType", 2);
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index adf6a26..da9a9b3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -141,7 +141,6 @@
</div>
</div>
-->
- <#input id="" name="" />
<div class="form-group">
<label class="col-sm-3 control-label">手机号运营商</label>
<div class="col-sm-9">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index df5ad1e..5b1f26f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -339,10 +339,7 @@
}
TOrderPrivateCar.frozenOrder = function(){
if (this.check()) {
- if (TOrderPrivateCar.seItem.state != 5 ) {
- swal("操作失败", "【服务中】状态下才能执行此操作", "warning");
- return;
- }else{
+ if (TOrderPrivateCar.seItem.isFrozen == 2){
var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) {
swal("操作订单成功", "您已经成功操作了。", "success");
TOrderPrivateCar.table.refresh();
@@ -353,8 +350,26 @@
});
ajax.set("tOrderPrivateCarId", TOrderPrivateCar.seItem.id);
ajax.start();
+ }else{
+ if (TOrderPrivateCar.seItem.state != 5 ) {
+ swal("操作失败", "【服务中】状态下才能执行此操作", "warning");
+ return;
+ }else{
+ var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) {
+ swal("操作订单成功", "您已经成功操作了。", "success");
+ TOrderPrivateCar.table.refresh();
+ layer.closeAll()
+ }, function (data) {
+ swal("操作订单失败", data.responseJSON.message + "！", "warning");
+ layer.closeAll()
+ });
+ ajax.set("tOrderPrivateCarId", TOrderPrivateCar.seItem.id);
+ ajax.start();
+ }
}
+
+
}
}
/**
--
Gitblit v1.7.1