From a13ac431dc2bea259bbc2f70b5b3144177ace918 Mon Sep 17 00:00:00 2001
From: Yifei Kuang <yifei.kuang@baisonmail.com>
Date: Sun, 1 Dec 2024 16:37:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=EF=BC=8C=E5=B8=88=E5=82=85=E7=AB=AF?=
 =?UTF-8?q?=E7=82=B9=E6=8E=A5=E5=8D=95=E9=94=AE=E6=8F=90=E7=A4=BA=EF=BC=88?=
 =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E5=90=8E=E5=86=8D=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderMasterController.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 7aea84d6..f57ed25f 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1397,6 +1397,14 @@ public class OrderMasterController extends BaseController {
                 }catch (Exception e){
                     logger.error("下单报错:" + ExceptionUtils.getMessage(e));
                 }
+                // 判断是否是在线支付订单--如果是在线支付,且未付款,则需要提示支付后接单
+                if(PayTypeEnum.WX_LITE.getCode().equals(model.getPayType())){
+                    // 查询财务信息
+                    FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(model.getId());
+                    if(!PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){
+                        return AjaxResult.error("待支付后再接单!");
+                    }
+                }
             }
             return AjaxResult.success("");
         } catch (Exception e) {