From c8e2fab9ae930401aabdd6c2d461aa6b8828829f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 六月 2023 14:56:31 +0800
Subject: [PATCH] 更新支付功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
index dd26dcb..5887e8b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
@@ -14,6 +14,7 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrder;
import com.stylefeng.guns.modular.system.service.ITAppUserService;
+import com.stylefeng.guns.modular.system.service.ITCancelOrderService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -54,6 +55,8 @@
private ITOrderService tOrderService;
@Autowired
private ITAppUserService tAppUserService;
+ @Autowired
+ private ITCancelOrderService tCancelOrderService;
/**
* 跳转到首页
@@ -183,7 +186,8 @@
String userPhone,
Integer state,
String driverName) {
- return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
+// return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
+ return tCancelOrderService.getCancelOrderList(createTime, code, source, userName, userPhone, state, driverName);
}
/**
@@ -198,7 +202,7 @@
EntityWrapper<TOrder> wrapper = new EntityWrapper<>();
if(Objects.nonNull(userId)){
- wrapper.eq("user_id",userId);
+ wrapper.eq("userId",userId);
}
List<TOrder> tOrders = tOrderService.selectList(wrapper);
for (TOrder tOrder : tOrders) {
--
Gitblit v1.7.1