feat(voucher): 兑换券业务严格隔离、前台全面去¥化、不足强拦截与售后闭环返还加固
1. 普通商品购买流程中严格禁止兑换券抵扣,仅限积分商城支持同等兑换 2. 积分商城卡片、详情、规格及结算页全面去除「¥」符号,强化「个兑换券 / 券」纯资产心智 3. 兑换券与积分逻辑完全对齐,兑换券不足时禁止掏现金补差,前端置灰禁用+后端抛出「兑换券不足」异常 4. 修复售后退款状态机识别偏差,并在订单失效/取消中增加已核销兑换券原路返还兜底 5. 新增及更新 6 套专项自动化测试(累计 200 项断言全部通过)
这个提交包含在:
@@ -29,12 +29,13 @@
|
||||
<view class="ss-col-bottom">
|
||||
<view
|
||||
v-if="goodsFields.score_price?.show"
|
||||
class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10 ss-flex ss-col-center"
|
||||
class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10 ss-flex ss-col-center ss-flex-wrap"
|
||||
:style="[{ color: goodsFields.score_price.color }]"
|
||||
>
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0">
|
||||
¥{{ data.price?.[0] || data.price }}
|
||||
<text v-if="Number(data.score) > 0">+</text>
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0" class="ss-flex ss-col-center">
|
||||
<text>{{ formatVoucher(data.price?.[0] || data.price) }}</text>
|
||||
<text class="ss-font-20 ss-m-l-2">券</text>
|
||||
<text v-if="Number(data.score) > 0" class="ss-m-x-4">+</text>
|
||||
</view>
|
||||
<image
|
||||
v-if="Number(data.score) > 0"
|
||||
@@ -42,9 +43,6 @@
|
||||
class="score-img"
|
||||
></image>
|
||||
<text v-if="Number(data.score) > 0">{{ data.score }}</text>
|
||||
<view v-if="Number(data.score) <= 0 && Number(data.price?.[0] || data.price) > 0" class="voucher-sub-tag ss-m-l-8">
|
||||
兑换券
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view
|
||||
@@ -95,12 +93,13 @@
|
||||
<view class="ss-m-t-10">
|
||||
<view
|
||||
v-if="goodsFields.score_price?.show"
|
||||
class="lg-goods-price ss-m-r-12 ss-flex ss-col-center font-OPPOSANS"
|
||||
class="lg-goods-price ss-m-r-12 ss-flex ss-col-center ss-flex-wrap font-OPPOSANS"
|
||||
:style="[{ color: goodsFields.score_price.color }]"
|
||||
>
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0">
|
||||
¥{{ data.price?.[0] || data.price }}
|
||||
<text v-if="Number(data.score) > 0">+</text>
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0" class="ss-flex ss-col-center">
|
||||
<text>{{ formatVoucher(data.price?.[0] || data.price) }}</text>
|
||||
<text class="ss-font-20 ss-m-l-2">券</text>
|
||||
<text v-if="Number(data.score) > 0" class="ss-m-x-4">+</text>
|
||||
</view>
|
||||
<image
|
||||
v-if="Number(data.score) > 0"
|
||||
@@ -108,9 +107,6 @@
|
||||
class="score-img"
|
||||
></image>
|
||||
<text v-if="Number(data.score) > 0">{{ data.score }}</text>
|
||||
<view v-if="Number(data.score) <= 0 && Number(data.price?.[0] || data.price) > 0" class="voucher-sub-tag ss-m-l-8">
|
||||
兑换券
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
v-if="goodsFields.price?.show && data.original_price > 0"
|
||||
@@ -160,20 +156,18 @@
|
||||
</view>
|
||||
</slot>
|
||||
<view class="ss-flex ss-col-bottom ss-p-l-16 ss-p-r-16 font-OPPOSANS">
|
||||
<view class="sl-goods-price ss-m-r-12 ss-flex ss-col-center">
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0">
|
||||
¥{{ data.price?.[0] || data.price }}
|
||||
<text v-if="Number(data.score) > 0">+</text>
|
||||
<view class="sl-goods-price ss-m-r-12 ss-flex ss-col-center ss-flex-wrap">
|
||||
<view v-if="Number(data.price?.[0] || data.price) > 0" class="ss-flex ss-col-center">
|
||||
<text>{{ formatVoucher(data.price?.[0] || data.price) }}</text>
|
||||
<text class="ss-font-20 ss-m-l-2">券</text>
|
||||
<text v-if="Number(data.score) > 0" class="ss-m-x-4">+</text>
|
||||
</view>
|
||||
<image
|
||||
v-if="Number(data.score) > 0"
|
||||
:src="sheep.$url.static('/assets/addons/shopro/uniapp/goods/score1.svg')"
|
||||
class="score-img"
|
||||
></image>
|
||||
<view v-if="Number(data.score) > 0">{{ data.score }}</view>
|
||||
<view v-if="Number(data.score) <= 0 && Number(data.price?.[0] || data.price) > 0" class="voucher-sub-tag ss-m-l-8">
|
||||
兑换券
|
||||
</view>
|
||||
<text v-if="Number(data.score) > 0">{{ data.score }}</text>
|
||||
</view>
|
||||
<view
|
||||
v-if="data.original_price > 0"
|
||||
@@ -201,6 +195,13 @@
|
||||
import { formatSales } from '@/sheep/hooks/useGoods';
|
||||
import { formatStock } from '@/sheep/hooks/useGoods';
|
||||
import goodsCollectVue from '@/pages/user/goods-collect.vue';
|
||||
|
||||
function formatVoucher(val) {
|
||||
if (val === '' || val === null || val === undefined || val === '--') return '0';
|
||||
const num = Number(val);
|
||||
if (isNaN(num)) return '0';
|
||||
return num % 1 === 0 ? String(Math.round(num)) : String(Number(num.toFixed(2)));
|
||||
}
|
||||
/**
|
||||
* 订单卡片
|
||||
*
|
||||
|
||||
@@ -10,17 +10,22 @@
|
||||
<view class="header-right ss-flex-col ss-row-between ss-flex-1">
|
||||
<view class="goods-title ss-line-2">{{ goodsInfo.title }}</view>
|
||||
<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
|
||||
<view class="ss-flex">
|
||||
<format-price :price="displaygoods.price" type="range" color="#FF4104" :decimal-scale="1" />
|
||||
|
||||
<view class="ss-flex">
|
||||
<view v-if="displaygoods.score > 0" class="score-text ss-m-l-4">+</view>
|
||||
<image v-if="displaygoods.score > 0"
|
||||
:src="sheep.$url.static('/assets/addons/shopro/uniapp/goods/score1.svg')" class="score-img"></image>
|
||||
<view v-if="displaygoods.score > 0" class="score-text">
|
||||
{{ displaygoods.score }}
|
||||
<view class="ss-flex ss-col-center">
|
||||
<template v-if="isScore">
|
||||
<view v-if="Number(displaygoods.price) > 0" class="ss-flex ss-col-center">
|
||||
<text class="score-text" style="color: #FF4104; font-weight: 600; font-size: 34rpx;">{{ formatVoucher(displaygoods.price) }}</text>
|
||||
<text class="ss-font-22 ss-m-l-4" style="color: #FF4104;">个兑换券</text>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="Number(displaygoods.price) > 0 && Number(displaygoods.score) > 0" class="score-text ss-m-x-6" style="color: #FF4104;">+</view>
|
||||
<view v-if="Number(displaygoods.score) > 0" class="ss-flex ss-col-center">
|
||||
<image :src="sheep.$url.static('/assets/addons/shopro/uniapp/goods/score1.svg')" class="score-img"></image>
|
||||
<view class="score-text" style="color: #FF4104; font-weight: 600; font-size: 34rpx;">{{ displaygoods.score }}</view>
|
||||
<text class="ss-font-22 ss-m-l-4" style="color: #FF4104;">积分</text>
|
||||
</view>
|
||||
</template>
|
||||
<template v-else>
|
||||
<format-price :price="displaygoods.price" type="range" color="#FF4104" :decimal-scale="1" />
|
||||
</template>
|
||||
</view>
|
||||
|
||||
<view class="stock-text ss-m-l-20">
|
||||
@@ -80,6 +85,13 @@ import { formatStock } from '@/sheep/hooks/useGoods';
|
||||
import { isArray, isEmpty } from 'lodash';
|
||||
import FormatPrice from '@/pages/goods/components/format-price.vue';
|
||||
|
||||
function formatVoucher(val) {
|
||||
if (val === '' || val === null || val === undefined || val === '--') return '0';
|
||||
const num = Number(val);
|
||||
if (isNaN(num)) return '0';
|
||||
return num % 1 === 0 ? String(Math.round(num)) : String(Number(num.toFixed(2)));
|
||||
}
|
||||
|
||||
const emits = defineEmits(['change', 'addCart', 'buyNow', 'close']);
|
||||
const props = defineProps({
|
||||
goods: {
|
||||
|
||||
在新工单中引用
屏蔽一个用户