支付

parent 5603a2bb
...@@ -151,7 +151,7 @@ import { ...@@ -151,7 +151,7 @@ import {
previewOrderBasketUpdate, previewOrderBasketUpdate,
sgyOrderOrderInfo, sgyOrderOrderInfo,
} from '@/api/assistingAgriculture/shop'; } from '@/api/assistingAgriculture/shop';
import { groupBuyConfirm } from '@/api/confirmOrder'; import { groupBuyConfirm, groupBuyUpdate, groupBuyCreate } from '@/api/confirmOrder';
const imgUrl = import.meta.env.VITE_APP_IMG_URL; const imgUrl = import.meta.env.VITE_APP_IMG_URL;
const textInputs = ref(''); const textInputs = ref('');
const basketIds = ref([]); const basketIds = ref([]);
...@@ -171,10 +171,14 @@ onLoad((options) => { ...@@ -171,10 +171,14 @@ onLoad((options) => {
prodIds.value = prodId; prodIds.value = prodId;
skuIds.value = skuId; skuIds.value = skuId;
types.value = type; types.value = type;
basketIds.value = ids.split(',');
if (type === 'qg') { if (type === 'qg') {
groupBuyConfirmFn(prodId, skuId); groupBuyConfirmFn(prodId, skuId).then((res) => {
useraddrDefaultUserAddrFn().then(() => {
groupBuyUpdateFnQg();
});
});
} else { } else {
basketIds.value = ids.split(',');
sgyrddBasketConfirmFn(basketIds.value).then(() => { sgyrddBasketConfirmFn(basketIds.value).then(() => {
useraddrDefaultUserAddrFn().then(() => { useraddrDefaultUserAddrFn().then(() => {
groupBuyUpdateFn(); groupBuyUpdateFn();
...@@ -182,14 +186,36 @@ onLoad((options) => { ...@@ -182,14 +186,36 @@ onLoad((options) => {
}); });
} }
}); });
function groupBuyUpdateFnQg(couponUserId = '') {
const { receiverName, receiverMobile, receiverAddress } = addressParams.value;
groupBuyUpdate({
key: orderInfo.value.key,
couponUserId,
receiverName,
receiverMobile,
receiverAddress,
}).then((res) => {
if (res.code === 0) {
orderInfo.value = res.data;
}
});
}
onShow(() => { onShow(() => {
if (changeAddress.value) { if (changeAddress.value) {
if (types.value === 'qg') {
groupBuyConfirmFn(prodIds.value, skuIds.value).then((res) => {
useraddrDefaultUserAddrFn().then(() => {
groupBuyUpdateFnQg();
});
});
} else {
sgyrddBasketConfirmFn(basketIds.value).then(() => { sgyrddBasketConfirmFn(basketIds.value).then(() => {
useraddrDefaultUserAddrFn().then(() => { useraddrDefaultUserAddrFn().then(() => {
groupBuyUpdateFn(); groupBuyUpdateFn();
}); });
}); });
} }
}
if (outTradeNos.value) { if (outTradeNos.value) {
// 查询订单状态决定是否支付 // 查询订单状态决定是否支付
...@@ -226,7 +252,6 @@ function groupBuyConfirmFn(prodId, skuId) { ...@@ -226,7 +252,6 @@ function groupBuyConfirmFn(prodId, skuId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
groupBuyConfirm({ prodId, skuId }).then((res) => { groupBuyConfirm({ prodId, skuId }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
res.data.orderItems[0].pic = imgUrl + res.data.orderItems[0].pic;
orderInfo.value = res.data; orderInfo.value = res.data;
resolve(res.data.shopId); resolve(res.data.shopId);
} else { } else {
...@@ -257,7 +282,11 @@ function selectShopCoupon(item) { ...@@ -257,7 +282,11 @@ function selectShopCoupon(item) {
activeCouponId.value = item.couponId; activeCouponId.value = item.couponId;
activeCouponInfo.value = item; activeCouponInfo.value = item;
showpopup.value = false; showpopup.value = false;
if (types.value === 'qg') {
groupBuyUpdateFnQg(item.couponUserId);
} else {
groupBuyUpdateFn(item.couponUserId); groupBuyUpdateFn(item.couponUserId);
}
} else { } else {
xma.showToast({ xma.showToast({
title: '不满足优惠券使用条件', title: '不满足优惠券使用条件',
...@@ -268,18 +297,11 @@ function selectShopCoupon(item) { ...@@ -268,18 +297,11 @@ function selectShopCoupon(item) {
const jumpToAddressList = () => { const jumpToAddressList = () => {
changeAddress.value = true; changeAddress.value = true;
wx.navigateTo({ wx.navigateTo({
url: '/pages/address/list', url: '/pages/address/addressList',
}); });
}; };
function groupBuyUpdateFn(couponUserId) { function groupBuyUpdateFn(couponUserId) {
const { receiverName, receiverMobile, receiverAddress } = addressParams.value; const { receiverName, receiverMobile, receiverAddress } = addressParams.value;
console.log(
'receiverName, receiverMobile, receiverAddress',
receiverName,
receiverMobile,
receiverAddress,
);
previewOrderBasketUpdate({ previewOrderBasketUpdate({
receiverName, receiverName,
receiverMobile, receiverMobile,
...@@ -328,6 +350,7 @@ const params = ref({ ...@@ -328,6 +350,7 @@ const params = ref({
basketIds: [], basketIds: [],
remark: '', remark: '',
}); });
const PaymentRef = ref(null); const PaymentRef = ref(null);
const openZfType = () => { const openZfType = () => {
PaymentRef.value.open(); PaymentRef.value.open();
...@@ -336,9 +359,32 @@ const payNow = async (data) => { ...@@ -336,9 +359,32 @@ const payNow = async (data) => {
params.value.id = orderInfo.value.key; params.value.id = orderInfo.value.key;
params.value.tradeType = data.selectType; params.value.tradeType = data.selectType;
params.value.basketIds = basketIds.value; params.value.basketIds = basketIds.value;
if (types.value === 'qg') {
const qgParams = {
id: orderInfo.value.key,
placeOrderWay: 'sgy',
payWayCode: 5,
tradeType: data.selectType,
};
groupBuyCreate(qgParams).then((res) => {
if (res.code === 0) {
openUrl(res.data.result);
} else {
groupBuyConfirmFn(prodIds.value, skuIds.value);
}
});
} else {
znsgyOrderCreate(params.value).then((res) => { znsgyOrderCreate(params.value).then((res) => {
if (res.code === 0) { if (res.code === 0) {
const { paymentUrl, outTradeNo } = res.data.result; openUrl(res.data.result);
} else {
groupBuyConfirmFn(prodIds.value, skuIds.value);
}
});
}
};
const openUrl = (result) => {
const { paymentUrl, outTradeNo } = result;
outTradeNos.value = outTradeNo; outTradeNos.value = outTradeNo;
window.location.href = paymentUrl; window.location.href = paymentUrl;
// 设置一个延时器 // 设置一个延时器
...@@ -354,10 +400,6 @@ const payNow = async (data) => { ...@@ -354,10 +400,6 @@ const payNow = async (data) => {
// 这里可以跳转到应用下载页面 // 这里可以跳转到应用下载页面
} }
}, 1600); }, 1600);
} else {
groupBuyConfirmFn(prodIds.value, skuIds.value);
}
});
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment