From 1f5f910e99d26fdea1ce5bf8707092947d523ed4 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 30 May 2024 11:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E5=85=85=E5=80=BC=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  2 +-
 src/api/pay.js                       | 13 +++++
 src/components/payCard/scanModal.vue | 72 +++++++++++++++++++---------
 3 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index a7e3a65..49bc01f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/src/api/pay.js b/src/api/pay.js
index 09eee98..98c1b2c 100644
--- a/src/api/pay.js
+++ b/src/api/pay.js
@@ -116,3 +116,16 @@ export function queryQuickPayStatus(params) {
     params,
   });
 }
+
+/**
+ * 获取会员支付状态查询
+ * @param {*} params
+ * @returns
+ */
+export function queryScanPay(params) {
+  return request({
+    method: "get",
+    url: "member/queryScanPay",
+    params,
+  });
+}
diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue
index 42058d3..0ccfe4f 100644
--- a/src/components/payCard/scanModal.vue
+++ b/src/components/payCard/scanModal.vue
@@ -54,7 +54,7 @@
 import _ from "lodash";
 import { ref } from "vue";
 import icon from "@/assets/icon_scan.png";
-import { scanpay, queryOrder, quickPay, queryQuickPayStatus, accountPay } from "@/api/pay";
+import { scanpay, queryOrder, quickPay, queryQuickPayStatus, accountPay, queryScanPay } from "@/api/pay";
 import { useUser } from "@/store/user.js";
 const store = useUser();
 import {
@@ -171,8 +171,9 @@ function clearAutoCheckOrder() {
 // 查询用户支付状态
 async function checkPayStauts(tips = true) {
   try {
-    if (props.fast) {
-      const res = await queryQuickPayStatus({ orderId: fastOrder.value.orderNo });
+    if (props.selecttype == 1) {
+      // 会员扫码充值
+      const res = await queryScanPay({ flowId: fastOrder.value.id });
       if (res.status == 0) {
         userPayWait.value = false
         loading.value = false;
@@ -183,7 +184,7 @@ async function checkPayStauts(tips = true) {
         emits("success");
         return;
       }
-      if (res.status == 1) {
+      if (res.status == 7) {
         if (tips) {
           ElMessage.warning("用户支付中...");
         }
@@ -194,26 +195,53 @@ async function checkPayStauts(tips = true) {
         return;
       }
     } else {
-      const res = await queryOrder({ orderId: props.orderId });
-      if (res.status == "closed") {
-        userPayWait.value = false
-        loading.value = false;
-        scanCode.value = "";
-        ElMessage.success("支付成功");
-        dialogVisible.value = false;
-        clearAutoCheckOrder()
-        emits("success");
-        return;
-      }
-      if (res.status == "paying") {
-        if (tips) {
-          ElMessage.warning("用户支付中...");
+      // 其他扫码支付
+      if (props.fast) {
+        // 快捷收银
+        const res = await queryQuickPayStatus({ orderId: fastOrder.value.orderNo });
+        if (res.status == 0) {
+          userPayWait.value = false
+          loading.value = false;
+          scanCode.value = "";
+          ElMessage.success("支付成功");
+          dialogVisible.value = false;
+          clearAutoCheckOrder()
+          emits("success");
+          return;
+        }
+        if (res.status == 1) {
+          if (tips) {
+            ElMessage.warning("用户支付中...");
+          }
+          return;
+        } else {
+          clearAutoCheckOrder()
+          ElMessage.error(res.payRemark || "支付失败！");
+          return;
         }
-        return;
       } else {
-        clearAutoCheckOrder()
-        ElMessage.error(res.payRemark || "支付失败！");
-        return;
+        // 扫码下单
+        const res = await queryOrder({ orderId: props.orderId });
+        if (res.status == "closed") {
+          userPayWait.value = false
+          loading.value = false;
+          scanCode.value = "";
+          ElMessage.success("支付成功");
+          dialogVisible.value = false;
+          clearAutoCheckOrder()
+          emits("success");
+          return;
+        }
+        if (res.status == "paying") {
+          if (tips) {
+            ElMessage.warning("用户支付中...");
+          }
+          return;
+        } else {
+          clearAutoCheckOrder()
+          ElMessage.error(res.payRemark || "支付失败！");
+          return;
+        }
       }
     }
   } catch (error) {