From 7ed6489395475fc41d33914dfcc940b75ff65101 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCancelOrderMapper.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCancelOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCancelOrderMapper.java
index a26731a..a2f70da 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCancelOrderMapper.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCancelOrderMapper.java
@@ -33,5 +33,14 @@
*/
List<TOrderResp> getCancelOrderList(@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("code") String code,
@Param("source") Integer source, @Param("userName")String userName, @Param("userPhone")String userPhone,
- @Param("state")Integer state, @Param("driverName")String driverName);
+ @Param("state")Integer state, @Param("driverName")String driverName,@Param("roleType")Integer roleType,
+ @Param("objectId")Integer objectId);
+
+ /**
+ * 订单异常详情页面的取消记录列表
+ * @param userId
+ * @param orderId
+ * @return
+ */
+ List<TOrderResp> userCancelOrderList(@Param("userId") Integer userId,@Param("orderId") Integer orderId);
}
--
Gitblit v1.7.1