czg_team/cashierdesktop
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化会员扫码充值查询

Browse Source
This commit is contained in:
gyq
2024-05-30 11:06:50 +08:00
parent c9dc11fa93
commit 1f5f910e99
3 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/components/payCard/scanModal.vue
View File

@@ -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) {