From fa677dec1c55db004a31beefb1e346e18c7858c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 18:41:29 +0800
Subject: [PATCH] bug修改

---
 src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
index bf09273..b6a6414 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
@@ -89,12 +89,14 @@
                 case 2:
                     // 璁㈠崟鍙�
                     query.orderNo = vo.getKey().trim();
+                    break;
                 case 3:
                     // 鏀粯璁惧ID
                     if (!NumberUtil.isNumeric(vo.getKey().trim())) {
                         throw new Exception("鏀粯璁惧ID蹇呴』涓烘暟瀛�");
                     }
                     query.distributeClientUid = Long.parseLong(vo.getKey().trim());
+                    break;
             }
 
         }
@@ -295,6 +297,7 @@
                 } else {
                     dto.setPayDevice("");
                 }
+                dto.setPayMerchant(order.getPayMerchant());
                 dataList.add(dto);
             }
 

--
Gitblit v1.8.0