From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/resources/template/订单记录.xlsx | 0
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WxChatPayCallBack.java | 11 ++++++++++-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 13 ++++++++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git "a/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx" "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
index 65a3e81..ab6185d 100644
--- "a/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
+++ "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
Binary files differ
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WxChatPayCallBack.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WxChatPayCallBack.java
index b03e338..3687009 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WxChatPayCallBack.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WxChatPayCallBack.java
@@ -111,7 +111,7 @@
withdrawDetail.setStatus("SUCCESS");
withdrawDetailService.updateById(withdrawDetail);
orderService.updateById(order);
- }else if ("CANCELLED".equals(state)){
+ }else if ("CANCELLED".equals(state)||"CANCELING".equals(state)||"FAIL".equals(state)){
// 校验提现
List<Withdraw> list = withdrawService.lambdaQuery().eq(Withdraw::getUserId, order.getUserId())
.eq(Withdraw::getOrderId, order.getId()).list();
@@ -200,4 +200,13 @@
return allTransfersSuccessful;
}
+// public static void main(String[] args) {
+// String s = "1827928ae317443a8ef788e9ed56e8dc";
+// String s1 = HttpUtil.queryTransBatRequest(WechatConstants.WE_CHAT_PAY_QUERY_URL_PRE + s,
+// "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
+// "1665330417",
+// "D:\\apiclient_key.pem", WechatConstants.WE_CHAT_QUERY_URL_SUF + s);
+// System.err.println(s1);
+// }
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 7965381..7dcdef3 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -400,7 +400,18 @@
</select>
<select id="excelExportList" resultMap="BaseResultMap">
- select *
+ SELECT o.id,o.reservation_name
+ ,o.reservation_name
+ ,o.reservation_phone
+ ,o.reservation_address
+ ,o.time
+ ,o.complete_time
+ ,o.serve_name
+ ,o.site_name
+ ,o.server_name
+ ,o.server_phone
+ ,o.remark
+
from t_order o
<where>
o.is_delete = 0
--
Gitblit v1.7.1