From 26dda54fd5fee791e5469df0c37bdba5797a80d7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 17:46:19 +0800
Subject: [PATCH] bug修改
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIncome/balance.html | 1 +
ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tIncome/balance.js | 3 ---
ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 4 ++--
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
index 42ae3b5..03213f9 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
@@ -179,7 +179,9 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<TOrderPrivateCar> tOrderPrivateCars = orderPrivateCarService.selectList(null);
+ List<TOrderPrivateCar> tOrderPrivateCars = orderPrivateCarService.selectList(
+ new EntityWrapper<TOrderPrivateCar>().eq("driverId",id)
+ );
List<Map<String, Object>> res = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -213,6 +215,7 @@
res.add(temp);
}
}
+
// 司机专车订单ids
List<Integer> orderIds = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>()
.eq("driverId", id)).stream()
@@ -300,7 +303,7 @@
}
}
// 平台充值
- if (handleType == null || handleType == 6){
+ if (handleType == null || handleType == 5){
Wrapper<TPubTransactionDetails> eq = new EntityWrapper<TPubTransactionDetails>()
.eq("userId", id)
.eq("orderType", 6)
@@ -325,7 +328,7 @@
}
}
// 平台扣除
- if (handleType == null || handleType == 7){
+ if (handleType == null || handleType == 6){
Wrapper<TPubTransactionDetails> eq = new EntityWrapper<TPubTransactionDetails>()
.eq("userId", id)
.eq("orderType", 7)
@@ -350,6 +353,46 @@
res.add(temp);
}
}
+ // 取消订单收入
+ if (handleType == null || handleType == 7){
+ Wrapper<Income> eq = new EntityWrapper<Income>()
+ .eq("objectId", id)
+ .eq("type", 3)
+ .eq("userType", 2);
+ if (beginTime!=null){
+ eq.ge("insertTime", beginTime);
+ eq.le("insertTime", endTime);
+ }
+ List<Income> incomes = tIncomeService.selectList(eq);
+ for (Income income : incomes) {
+ Map<String, Object> temp = new HashMap<>();
+ String times = simpleDateFormat.format(income.getInsertTime());
+ if (income.getIncomeId()!=null){
+ TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCars.stream().filter(e -> e.getId()
+ .equals(income.getIncomeId())).findFirst().orElse(null);
+ temp.put("orderNumber",tOrderPrivateCar==null?null:tOrderPrivateCar.getOrderNum());
+ temp.put("remark",tOrderPrivateCar.getRemark());
+ }
+ temp.put("times",times);
+ temp.put("handleType","取消订单收入");
+ temp.put("amount",income.getMoney());
+ temp.put("withType","订单号");
+ // todo 新增收入明细时 需要存储当前账户余额
+ temp.put("balance",income.getDriverBalance());
+ res.add(temp);
+ }
+ }
+ res.sort((o1, o2) -> {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ Date date1 = format.parse((String) o1.get("times"));
+ Date date2 = format.parse((String) o2.get("times"));
+ return date2.compareTo(date1); // 降序
+ } catch (Exception e) {
+ e.printStackTrace();
+ return 0;
+ }
+ });
return res;
}
@RequestMapping("/getExcel")
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIncome/balance.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIncome/balance.html
index 05714da..30923fa 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIncome/balance.html
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIncome/balance.html
@@ -23,6 +23,7 @@
<option value="4">提现</option>
<option value="5">平台充值</option>
<option value="6">平台扣除</option>
+ <option value="7">取消订单收入</option>
</#SelectCon>
</div>
<div class="col-sm-3">
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tIncome/balance.js b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tIncome/balance.js
index 7f68297..2386983 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tIncome/balance.js
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tIncome/balance.js
@@ -45,7 +45,6 @@
* 打开查看专车订单详情
*/
TIncome.orderDetail = function (value) {
- if (this.check()) {
var index = layer.open({
type: 2,
title: '专车订单详情',
@@ -55,7 +54,6 @@
content: Feng.ctxPath + '/tOrderPrivateCar/tOrderPrivateCar_orderDetailByOrderNumber/' + value
});
this.layerIndex = index;
- }
};
/**
* 点击添加
@@ -121,7 +119,6 @@
TIncome.resetSearch = function () {
$("#insertTime").val("");
$("#handleType").val("");
- $("#id").val("");
TIncome.search();
};
$(function () {
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index aaf74d2..3d239c1 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -368,8 +368,8 @@
} else {
nickname = "【" + nickname + "】";
}
- if (TOrderPrivateCar.seItem.state == 7 || TOrderPrivateCar.seItem.state == 8 || TOrderPrivateCar.seItem.state == 9 || TOrderPrivateCar.seItem.state == 10 ) {
- swal("取消失败", "【待评价】【已完成】【已取消】状态下不能执行此操作", "warning");
+ if ( TOrderPrivateCar.seItem.state == 8 || TOrderPrivateCar.seItem.state == 9 || TOrderPrivateCar.seItem.state == 10 ) {
+ swal("取消失败", "【已完成】【已取消】状态下不能执行此操作", "warning");
return;
}
swal({
--
Gitblit v1.7.1