From dbc7444e78ca0a427046cbfb488646ee1f39a1c0 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 17 May 2024 18:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BF=AB=E6=8D=B7=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |   3 +-
 .env.production                             |   5 +-
 package.json                                |   2 +-
 src/api/pay.js                              | 117 ++++++++++--------
 src/components/payCard/scanModal.vue        | 125 ++++++++++++--------
 src/views/home/components/settleAccount.vue |   4 +-
 vite.config.js                              |   5 +-
 7 files changed, 152 insertions(+), 109 deletions(-)

diff --git a/.env.development b/.env.development
index 6583432..fc6d7b6 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,7 @@
 ENV = development
 
 # 本地环境接口地址
-VITE_API_URL = 'http://192.168.2.27:10587/cashier-client'
+VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
+# VITE_API_URL = 'http://192.168.2.27:10587/cashier-client'
 # VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client'
 # VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 65e72e0..1b05e5b 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,6 @@
 ENV = production
 
 # 线上环境接口地址
-VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/'
-# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client'
\ No newline at end of file
+# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/'
+# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client'
+VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
\ No newline at end of file
diff --git a/package.json b/package.json
index 440a3d0..81695df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.1.2",
+	"version": "1.1.9",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/src/api/pay.js b/src/api/pay.js
index 10c09a5..09eee98 100644
--- a/src/api/pay.js
+++ b/src/api/pay.js
@@ -1,68 +1,68 @@
-import request from "@/utils/request.js"
+import request from "@/utils/request.js";
 
 /**
  * 查询分类信息
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export function queryPayType(params) {
-    return request({
-        method: "get",
-        url: "pay/queryPayType",
-        params
-    });
+  return request({
+    method: "get",
+    url: "pay/queryPayType",
+    params,
+  });
 }
 
 /**
  * 付款
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export function payOrder(api, params) {
-    return request({
-        method: "get",
-        url: api,
-        params
-    });
+  return request({
+    method: "get",
+    url: api,
+    params,
+  });
 }
 
 /**
  * 扫码支付
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export function scanpay(params) {
-    return request({
-        method: "get",
-        url: 'pay/scanpay',
-        params
-    });
+  return request({
+    method: "get",
+    url: "pay/scanpay",
+    params,
+  });
 }
 
 /**
  * 储值卡付款
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export function accountPay(params) {
-    return request({
-        method: "get",
-        url: 'pay/accountPay',
-        params
-    });
+  return request({
+    method: "get",
+    url: "pay/accountPay",
+    params,
+  });
 }
 
 /**
  * 现金付款
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export function cashPay(params) {
-    return request({
-        method: "get",
-        url: 'pay/cashPay',
-        params
-    });
+  return request({
+    method: "get",
+    url: "pay/cashPay",
+    params,
+  });
 }
 
 /**
@@ -71,11 +71,11 @@ export function cashPay(params) {
  * @returns
  */
 export function queryOrder(params) {
-    return request({
-        method: "get",
-        url: "pay/queryOrder",
-        params
-    });
+  return request({
+    method: "get",
+    url: "pay/queryOrder",
+    params,
+  });
 }
 
 /**
@@ -84,11 +84,11 @@ export function queryOrder(params) {
  * @returns
  */
 export function print(params) {
-    return request({
-        method: "get",
-        url: "cloudPrinter/print",
-        params
-    });
+  return request({
+    method: "get",
+    url: "cloudPrinter/print",
+    params,
+  });
 }
 
 /**
@@ -97,9 +97,22 @@ export function print(params) {
  * @returns
  */
 export function quickPay(params) {
-    return request({
-        method: "get",
-        url: "pay/quickPay",
-        params
-    });
-}
\ No newline at end of file
+  return request({
+    method: "get",
+    url: "pay/quickPay",
+    params,
+  });
+}
+
+/**
+ * 查询快捷收银订单
+ * @param {*} params
+ * @returns
+ */
+export function queryQuickPayStatus(params) {
+  return request({
+    method: "get",
+    url: "pay/queryQuickPayStatus",
+    params,
+  });
+}
diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue
index c57b215..fe96e8f 100644
--- a/src/components/payCard/scanModal.vue
+++ b/src/components/payCard/scanModal.vue
@@ -2,12 +2,7 @@
 
 <template>
   <div class="dialog">
-    <el-dialog
-      title="扫码支付"
-      width="600"
-      v-model="dialogVisible"
-      @open="reset"
-    >
+    <el-dialog title="扫码支付" width="600" v-model="dialogVisible" @open="reset" @close="clearAutoCheckOrder">
       <div class="content">
         <div class="left">
           <el-image :src="icon" style="width: 60px; height: 60px"></el-image>
@@ -18,15 +13,9 @@
             <span class="n">{{ props.amount }}</span>
           </div>
           <div class="input">
-            <el-input
-              ref="inputRef"
-              v-model="scanCode"
-              style="height: calc(var(--el-component-size-large) + 30px)"
-              placeholder="请扫描付款码"
-              clearable
-              @change="inputChange"
-            ></el-input>
-            <div class="tips">注意：扫码支付请保证输入框获得焦点</div>
+            <el-input ref="inputRef" v-model="scanCode" style="height: calc(var(--el-component-size-large) + 30px)"
+              placeholder="请扫描付款码" clearable @change="inputChange"></el-input>
+            <div class="tips">注意：扫码支付请保证输入框获得焦点，输入内容结束后会自动支付，请勿重复操作</div>
           </div>
           <!-- <div class="number_warp">
                         <div class="item" v-for="item in 9" :key="item" @click="inputHandle(item)">{{ item }}</div>
@@ -39,36 +28,21 @@
                         </div>
                     </div> -->
           <div class="btn">
-            <el-button
-              type="primary"
-              style="width: 100%"
-              v-loading="loading"
-              @click="submitHandle"
-              >立即支付</el-button
-            >
+            <el-button type="primary" style="width: 100%" v-loading="loading">立即支付</el-button>
           </div>
         </div>
         <div class="pay_wait" v-else>
-          <div
-            class="loading"
-            v-loading="loading"
-            element-loading-text="用户支付中..."
-          ></div>
+          <div class="loading" v-loading="loading" element-loading-text="用户支付中..."></div>
           <div class="btn">
-            <el-button
-              type="primary"
-              style="width: 100%"
-              v-loading="checkPayStatusLoading"
-              @click="checkPayStauts"
-            >
+            <el-button type="primary" style="width: 100%" v-loading="checkPayStatusLoading" @click="checkPayStauts">
               <span v-if="!checkPayStatusLoading">查询用户支付状态</span>
               <span v-else>查询中...</span>
             </el-button>
           </div>
           <div class="btn">
-            <el-button style="width: 100%" @click="resetScanCode"
-              >重新扫码</el-button
-            >
+            <el-button style="width: 100%" @click="resetScanCode">
+              重新扫码
+            </el-button>
           </div>
         </div>
       </div>
@@ -80,7 +54,7 @@
 import _ from "lodash";
 import { ref } from "vue";
 import icon from "@/assets/icon_scan.png";
-import { scanpay, queryOrder, quickPay } from "@/api/pay";
+import { scanpay, queryOrder, quickPay, queryQuickPayStatus } from "@/api/pay";
 import { useUser } from "@/store/user.js";
 const store = useUser();
 import {
@@ -119,6 +93,8 @@ const loading = ref(false);
 const userPayWait = ref(false);
 const checkPayStatusLoading = ref(false);
 
+const fastOrder = ref('')
+
 // 提交扫码支付
 async function submitHandle() {
   try {
@@ -152,8 +128,11 @@ async function submitHandle() {
     dialogVisible.value = false;
     emits("success");
   } catch (error) {
+    console.log(error);
     if (error.code === "100015") {
       userPayWait.value = true;
+      fastOrder.value = error.data
+      autoCheckOrder()
     } else {
       loading.value = false;
       console.log(error);
@@ -161,21 +140,68 @@ async function submitHandle() {
   }
 }
 
+
+const timer = ref(null)
+// 自动查询订单状态
+function autoCheckOrder() {
+  timer.value = setInterval(() => {
+    checkPayStauts(false)
+  }, 2000)
+}
+
+// 清除自动查询扫码支付订单
+function clearAutoCheckOrder() {
+  clearInterval(timer.value)
+  timer.value = null
+}
+
 // 查询用户支付状态
-async function checkPayStauts() {
+async function checkPayStauts(tips = true) {
   try {
-    const res = await queryOrder({ orderId: props.orderId });
-    if (res.status == "closed") {
-      ElMessage.success("支付成功");
-      emits("success");
-      return;
-    }
-    if (res.status == "paying") {
-      ElMessage.warning("用户支付中...");
-      return;
+    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;
+      }
     } else {
-      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) {
     console.log(error);
@@ -184,6 +210,7 @@ async function checkPayStauts() {
 
 // 重新扫码
 function resetScanCode() {
+  clearAutoCheckOrder()
   userPayWait.value = false;
   loading.value = false;
   scanCode.value = "";
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index abe9831..4e8bc8c 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -141,7 +141,7 @@ async function printHandle() {
       };
       ipcRenderer.send("printerInfoSync", JSON.stringify(data));
     } else {
-      ElMessage.error("您还没有添加本地打印设备，将使用网络打印");
+      // ElMessage.error("您还没有添加本地打印设备，将使用网络打印");
       try {
         printLoading.value = true;
         await print({
@@ -150,7 +150,7 @@ async function printHandle() {
           orderId: props.orderInfo.id,
         });
         printLoading.value = false;
-        ElMessage.success("打印成功");
+        // ElMessage.success("打印成功");
       } catch (error) {
         printLoading.value = false;
         console.log(error);
diff --git a/vite.config.js b/vite.config.js
index 11187af..78e8ce7 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,9 +9,10 @@ export default defineConfig({
   server: {
     proxy: {
       '/api': {
-        target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 线上
+        // target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 线上
         // target: 'http://192.168.2.116:10587/cashier-client', // 国成
-        // target: 'http://192.168.2.128:10587/cashier-client',
+        // target: 'http://192.168.2.171:10587/cashier-client', // 鹏辉
+        target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, '')
       }