添加虚拟支付
This commit is contained in:
@@ -69,6 +69,7 @@ module.exports = {
|
||||
OrderDetail: ApiRootUrl + 'order/detail', //订单详情
|
||||
OrderSettleDetail: ApiRootUrl + 'order/settleDetail', //订单结算详情
|
||||
OrderCommitPay: ApiRootUrl + 'order/commitPay', //订单提交支付数据
|
||||
OrderVirtualPayConfirm: ApiRootUrl + 'order/virtualPayConfirm', //虚拟支付结果确认
|
||||
OrderDelete: ApiRootUrl + 'order/delete', //订单删除
|
||||
OrderCancel: ApiRootUrl + 'order/cancel', //取消订单
|
||||
OrderOperate: ApiRootUrl + 'order/orderOperate', //操作订单
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import Dialog from 'tdesign-miniprogram/dialog/index';
|
||||
import Toast from 'tdesign-miniprogram/toast/index';
|
||||
|
||||
import { dispatchCommitPay } from '../../../services/order/orderConfirm';
|
||||
import { confirmVirtualPay, dispatchCommitPay } from '../../../services/order/orderConfirm';
|
||||
|
||||
// 真实的提交支付
|
||||
export const commitPay = (params) => {
|
||||
@@ -90,24 +90,64 @@ export const payFail = (payOrderInfo, resultMsg) => {
|
||||
}
|
||||
};
|
||||
|
||||
// 微信支付方式
|
||||
function compareVersion(v1, v2) {
|
||||
const left = String(v1 || '0').split('.');
|
||||
const right = String(v2 || '0').split('.');
|
||||
const len = Math.max(left.length, right.length);
|
||||
for (let i = 0; i < len; i += 1) {
|
||||
const num1 = parseInt(left[i] || '0', 10);
|
||||
const num2 = parseInt(right[i] || '0', 10);
|
||||
if (num1 > num2) {
|
||||
return 1;
|
||||
}
|
||||
if (num1 < num2) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
function canVirtualPay() {
|
||||
if (typeof wx.canIUse === 'function' && wx.canIUse('requestVirtualPayment')) {
|
||||
return true;
|
||||
}
|
||||
const version = (wx.getSystemInfoSync() || {}).SDKVersion || '0.0.0';
|
||||
return compareVersion(version, '2.19.2') >= 0;
|
||||
}
|
||||
|
||||
// 虚拟支付。signData 使用服务端原文字符串,不能再 JSON.stringify
|
||||
export const wechatPayOrder = (payOrderInfo) => {
|
||||
const payInfo = payOrderInfo.payInfo;
|
||||
const { timeStamp, nonceStr, signType, paySign } = payInfo;
|
||||
const payInfo = payOrderInfo.payInfo || {};
|
||||
if (!canVirtualPay()) {
|
||||
payFail(payOrderInfo, '当前微信版本过低,请升级后再支付');
|
||||
return Promise.resolve();
|
||||
}
|
||||
return new Promise((resolve) => {
|
||||
// 只有 wx.requestPayment 回调 success 才认为是支付成功,不能提前跳转支付结果页
|
||||
wx.requestPayment({
|
||||
timeStamp,
|
||||
nonceStr,
|
||||
package: payInfo.package,
|
||||
signType,
|
||||
paySign,
|
||||
success: function () {
|
||||
paySuccess(payOrderInfo);
|
||||
resolve();
|
||||
wx.requestVirtualPayment({
|
||||
signData: payInfo.signData,
|
||||
paySig: payInfo.paySig,
|
||||
signature: payInfo.signature,
|
||||
mode: payInfo.mode,
|
||||
success() {
|
||||
confirmVirtualPay(payOrderInfo.tradeNo).then((res) => {
|
||||
if (!res || res.code !== 1) {
|
||||
payFail(payOrderInfo, (res && res.msg) || '支付结果确认失败,请稍后在订单中再次支付,不会重复扣款');
|
||||
return;
|
||||
}
|
||||
paySuccess(payOrderInfo);
|
||||
resolve();
|
||||
}).catch((err) => {
|
||||
payFail(payOrderInfo, (err && err.msg) || '支付结果确认失败,请稍后在订单中再次支付,不会重复扣款');
|
||||
});
|
||||
},
|
||||
fail: function (err) {
|
||||
payFail(payOrderInfo, err.errMsg);
|
||||
fail(err) {
|
||||
const errCode = err && err.errCode;
|
||||
const errMsg = (err && err.errMsg) || '支付失败';
|
||||
if (errCode === -2 || errMsg.indexOf('cancel') !== -1) {
|
||||
payFail(payOrderInfo, 'requestPayment:fail cancel');
|
||||
return;
|
||||
}
|
||||
payFail(payOrderInfo, errMsg);
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -52,6 +52,11 @@ export function dispatchCommitPay(params) {
|
||||
return wx.$util.request(wx.$api.OrderCommitPay, params, 'POST');
|
||||
}
|
||||
|
||||
/** 虚拟支付收银台成功后,通知服务端查单并入账 */
|
||||
export function confirmVirtualPay(orderNo) {
|
||||
return wx.$util.request(wx.$api.OrderVirtualPayConfirm, { orderNo }, 'POST');
|
||||
}
|
||||
|
||||
/* 订单操作 */
|
||||
export function orderOperate(params) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user