fix:修复支付分订单创建,订单套餐没有更新的问题
This commit is contained in:
+31
-28
@@ -57,10 +57,10 @@
|
||||
</view>
|
||||
|
||||
<view class="pricing-rules">
|
||||
<view class="rule-item">
|
||||
<!-- <view class="rule-item">
|
||||
<view class="rule-dot"></view>
|
||||
<text class="rule-text">前15分钟内归还<text class="highlight">免费</text></text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="rule-item">
|
||||
<view class="rule-dot"></view>
|
||||
<text class="rule-text">不足60分钟按60分钟计费</text>
|
||||
@@ -420,37 +420,40 @@
|
||||
|
||||
// 获取后端返回的订单信息
|
||||
const order = rentResult.data
|
||||
//当支付方式为押金支付时
|
||||
|
||||
// --- 统一:先更新订单套餐信息 ---
|
||||
try {
|
||||
let packageTimeMinutes = 0;
|
||||
if (selectedPkg.time.includes('小时')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||
} else if (selectedPkg.time.includes('分钟')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time);
|
||||
} else {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
|
||||
}
|
||||
|
||||
const updateRes = await updateOrderPackage({
|
||||
orderId: order.orderId,
|
||||
packageTime: packageTimeMinutes,
|
||||
packagePrice: parseFloat(selectedPkg.price)
|
||||
});
|
||||
if (updateRes.code !== 200) {
|
||||
console.warn("更新订单套餐信息失败:", updateRes.msg);
|
||||
// 这里可以选择是否提示用户或阻止流程,当前不阻止
|
||||
} else {
|
||||
console.log("订单套餐信息已提前更新");
|
||||
}
|
||||
} catch (updateError) {
|
||||
console.error("更新订单套餐信息时出错:", updateError);
|
||||
// 即使更新失败,也继续流程
|
||||
}
|
||||
// --- 套餐信息更新结束 ---
|
||||
|
||||
if (payWay == 'wx-pay') {
|
||||
//当支付方式为押金支付时
|
||||
uni.hideLoading()
|
||||
const res = await getOrderByOrderNo(order.orderNo);
|
||||
console.log(res);
|
||||
try {
|
||||
let packageTimeMinutes = 0;
|
||||
if (selectedPkg.time.includes('小时')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||
} else if (selectedPkg.time.includes('分钟')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time);
|
||||
} else {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
|
||||
}
|
||||
|
||||
const updateRes = await updateOrderPackage({
|
||||
orderId: order.orderId,
|
||||
packageTime: packageTimeMinutes,
|
||||
packagePrice: parseFloat(selectedPkg.price)
|
||||
});
|
||||
if (updateRes.code !== 200) {
|
||||
console.warn("更新订单套餐信息失败:", updateRes.msg);
|
||||
// 这里可以选择是否提示用户或阻止流程,当前不阻止
|
||||
} else {
|
||||
console.log("订单套餐信息已提前更新");
|
||||
}
|
||||
} catch (updateError) {
|
||||
console.error("更新订单套餐信息时出错:", updateError);
|
||||
// 即使更新失败,也继续尝试跳转支付,让用户完成支付
|
||||
}
|
||||
// --- 新增:计算总金额 ---
|
||||
const deposit = parseFloat(deviceInfo.value.depositAmount);
|
||||
const packagePrice = parseFloat(selectedPkg.price);
|
||||
|
||||
@@ -54,10 +54,10 @@
|
||||
</view>
|
||||
<view class="divider"></view>
|
||||
<view class="rule-list">
|
||||
<view class="rule-item">
|
||||
<!-- <view class="rule-item">
|
||||
<view class="rule-dot"></view>
|
||||
<text>15分钟内归还免费</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="rule-item">
|
||||
<view class="rule-dot"></view>
|
||||
<text>不足1小时按1小时计费</text>
|
||||
|
||||
Reference in New Issue
Block a user