From e8b7a1942116c4dffa4e8dc2866a4384a55380d3 Mon Sep 17 00:00:00 2001
From: wyq <wangyuqi234@163.com>
Date: Tue, 29 Apr 2025 10:15:12 +0800
Subject: [PATCH] 1

---
 crmeb-admin/pom.xml                                       | 2 +-
 crmeb-front/pom.xml                                       | 2 +-
 .../zbkj/service/service/impl/OrderPayServiceImpl.java    | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crmeb-admin/pom.xml b/crmeb-admin/pom.xml
index d1dbd94..c8473a3 100644
--- a/crmeb-admin/pom.xml
+++ b/crmeb-admin/pom.xml
@@ -31,7 +31,7 @@
 
     <build>
         <!--打包配置-->
-        <finalName>Crmeb-admin</finalName>
+        <finalName>wechat-admin</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/crmeb-front/pom.xml b/crmeb-front/pom.xml
index c910ca3..a0d98df 100644
--- a/crmeb-front/pom.xml
+++ b/crmeb-front/pom.xml
@@ -31,7 +31,7 @@
 
     <build>
         <!--打包配置-->
-        <finalName>Crmeb-front</finalName>
+        <finalName>wechat-front</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
index 90f7fa1..e614ed5 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
@@ -739,8 +739,12 @@ public class OrderPayServiceImpl implements OrderPayService {
         if (storeOrder.getPaid()) {
             throw new CrmebException("订单已支付");
         }
-        //支付前查看先订单之前是否有支付会自动更新订单表
-        weChatPayService.queryPayResult(storeOrder.getOrderId());
+        try {
+            //支付前查看先订单之前是否有支付会自动更新订单表
+            weChatPayService.queryPayResult(storeOrder.getOrderId());
+        }catch (Exception e){
+            logger.error("订单支付查询异常",e);
+        }
         storeOrder = storeOrderService.getByOderId(orderPayRequest.getOrderNo());
         if (storeOrder.getPaid()) {
             throw new CrmebException("订单已支付");