chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

套餐修改

Browse Source
This commit is contained in:
墨大叔 2024-08-16 22:20:37 +08:00
parent 6685b187ae
commit 9ad781a702
9 changed files with 152 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/ss/payBill.js
View File

@ -42,3 +42,12 @@ export function delPayBill(payId) {
method: 'delete'
})
}
// 支付订单退款
export function refundPayBill(data) {
return request({
url: '/ss/payBill/refund',
method: 'put',
data
})
}

8
src/api/system/device.js
View File

@ -93,6 +93,14 @@ export function resetDevice(deviceId) {
})
}
// 电量归零
export function resetEleDevice(deviceId) {
return request({
url: `/system/device/${deviceId}/resetEle`,
method: 'put'
})
}
// 批量修改型号
export function batchUpdateModel(deviceIds, modelId) {
return request({

9
src/utils/constants.js
View File

@ -101,3 +101,12 @@ export const PayBillBstType = {
RECHARGE: "3", // 充值订单
RECHARGE_DEPOSIT: "4", // 充值订单押金
}
export const PayBillStatus = {
WAIT_PAY: "1", // 待支付
PAYING: "2", // 支付中
PAY_SUCCESS: "3", // 支付成功
CANCEL: "4", // 已取消
REFUNDING: "5", // 退款中
REFUNDED: "6", // 已退款
}

75
src/views/ss/payBill/index.vue
View File

@ -102,7 +102,7 @@
<template v-else-if="column.key === 'channelId'">
<dict-tag :options="dict.type.channel_type" :value="d.row.channelId"/>
</template>
<template v-else-if="['channelCost', 'amount'].includes(column.key)">
<template v-else-if="['channelCost', 'amount', 'refundingAmount', 'refundAmount'].includes(column.key)">
{{d.row[column.key] | money}} 元
</template>
<template v-else>
@ -111,11 +111,19 @@
</template>
</el-table-column>
</template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="d">-->
<!-- <el-button-->
<!-- icon="el-icon-refresh"-->
<!-- type="text"-->
<!-- @click="handleRefund(d.row)"-->
<!-- v-show="canRefund(d.row)"-->
<!-- v-has-permi="['ss:payBill:refund']"-->
<!-- >-->
<!-- 退款-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -125,12 +133,28 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog :visible.sync="showRefund" title="退款申请" center width="500px">
<el-form :model="refundForm" :rules="refundRules" label-width="6em">
<el-form-item label="退款金额" prop="refundAmount">
<el-input-number v-model="refundForm.refundAmount" :precision="2" :min="0.01" controls-position="right" style="calc(100% - 3em)"/> 元
</el-form-item>
<el-form-item label="退款原因" prop="refundReason">
<el-input v-model="refundForm.refundReason" placeholder="请输入退款原因" maxlength="200" show-word-limit :rows="3" type="textarea"/>
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="handleSubmitRefund">申请退款</el-button>
</template>
</el-dialog>
</div>
</template>
<script>
import { listPayBill, getPayBill, delPayBill, addPayBill, updatePayBill } from "@/api/ss/payBill";
import { listPayBill, getPayBill, delPayBill, addPayBill, updatePayBill, refundPayBill } from '@/api/ss/payBill'
import { $showColumns, $view } from '@/utils/mixins'
import { PayBillStatus } from '@/utils/constants'
// 默认排序字段
const defaultSort = {
@ -150,21 +174,38 @@ export default {
}
}
},
computed: {
canRefund() {
return (row) => {
return row != null && row.status === PayBillStatus.PAY_SUCCESS;
}
},
canRefresh() {
return (row) => {
return row != null && row.status === PayBillStatus.PAYING;
}
}
},
data() {
return {
showRefund: false,
refundForm: [],
refundRules: [],
// 字段列表
columns: [
{key: 'payId', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'payNo', visible: true, label: '支付订单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
{key: 'bstType', visible: true, label: '业务类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'bstId', visible: false, label: '业务ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'amount', visible: true, label: '订单金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'amount', visible: true, label: '支付金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'channelId', visible: true, label: '支付渠道', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'status', visible: true, label: '支付状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'payTime', visible: true, label: '支付时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'description', visible: true, label: '描述', minWidth: "200", sortable: true, overflow: true, align: 'center', width: null},
{key: 'account', visible: true, label: '支付账号', minWidth: "100", sortable: true, overflow: true, align: 'center', width: null},
{key: 'channelCost', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'refundAmount', visible: true, label: '已退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'refundingAmount', visible: true, label: '退款中金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
@ -247,6 +288,24 @@ export default {
this.getList();
},
methods: {
handleSubmitRefund() {
refundPayBill(this.refundForm).then(res => {
if (res.code === 200) {
this.$message.success("申请成功，退款中");
this.showRefund = false;
}
}).finally(() => {
this.getList();
})
},
handleRefund(row) {
this.refundForm = {
payId: row.payId,
refundAmount: row.amount,
refundReason: `支付订单${row.payNo}退款`
}
this.showRefund = true;
},
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {

12
src/views/ss/refund/index.vue
View File

@ -74,12 +74,8 @@
<el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="退款ID" align="center" prop="refundId" width="80"/>
<el-table-column label="退款订单编号" align="center" prop="refundNo" />
<el-table-column label="原订单编号" align="center" prop="billNo" >
<template slot-scope="d">
<recharge-link :bill-id="d.row.billId" :text="d.row.billNo"/>
</template>
</el-table-column>
<el-table-column label="退款订单编号" align="center" prop="refundNo" width="180"/>
<el-table-column label="支付订单编号" align="center" prop="payNo" width="180"/>
<el-table-column label="退款金额" align="center" prop="amount" >
<template slot-scope="d">
{{d.row.amount | money}} 元
@ -92,8 +88,8 @@
</template>
</el-table-column>
<el-table-column label="操作人类型" align="center" prop="userType">
<template slot-scope="scope">
<dict-tag :options="dict.type.login_user_type" :value="scope.row.userType"/>
<template slot-scope="d">
<dict-tag :options="dict.type.login_user_type" :value="d.row.userType"/>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="userName"/>

13
src/views/ss/suit/index.vue
View File

@ -84,13 +84,16 @@
<el-table-column label="所属用户" align="center" prop="userName" width="180">
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
</el-table-column>
<el-table-column label="通电时间" align="center" prop="value" width="100">
<template slot-scope="d">{{d.row.value}} {{suitTimeUnit(d.row.timeUnit)}}</template>
<el-table-column label="收费模式" align="center" prop="feeMode">
<dict-tag slot-scope="d" :value="d.row.feeMode" :options="dict.type.suit_fee_mode"/>
</el-table-column>
<el-table-column label="价格" align="center" prop="price" width="100">
<template slot-scope="d">{{d.row.price | money}}元</template>
<el-table-column label="收费类型" align="center" prop="feeType" width="160">
<dict-tag slot-scope="d" :value="d.row.feeType" :options="dict.type.suit_fee_type"/>
</el-table-column>
<el-table-column label="详细说明" align="center" prop="description" show-overflow-tooltip width="300"/>
<el-table-column label="价格/押金" align="center" prop="price" width="100">
<template slot-scope="d">{{d.row.price | money}} 元</template>
</el-table-column>
<el-table-column label="详细说明" align="center" prop="description" show-overflow-tooltip min-width="300"/>
<el-table-column label="应用设备" align="center" prop="deviceList" min-width="200">
<template slot-scope="d">
<template v-for="(item, index) in d.row.deviceList" >

29
src/views/system/device/detail.vue
View File

@ -15,6 +15,9 @@
<el-dropdown-item>
<el-link :underline="false" icon="el-icon-refresh" @click="handleReset">时长归零</el-link>
</el-dropdown-item>
<el-dropdown-item>
<el-link :underline="false" icon="el-icon-refresh" @click="handleResetEle">电量归零</el-link>
</el-dropdown-item>
<el-dropdown-item>
<el-link :underline="false" icon="el-icon-switch-button" v-if="!isOpen" @click="handleSwitch(true)">强制开启</el-link>
</el-dropdown-item>
@ -56,12 +59,12 @@
<el-descriptions-item label="设备租期">{{deviceData.rentTime | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="剩余时长">{{surplusTimeDesc(surplusTime).text}}</el-descriptions-item>
<el-descriptions-item label="设备剩余时长">
{{surplusTimeDesc(deviceData.remainTime).text}}
<el-descriptions-item label="设备剩余时长/电量" :span="2">
{{surplusTimeDesc(deviceData.remainTime).text}} / {{deviceData.surplusEle | defaultValue}} 度
<span class="remark-text">最近更新时间：{{deviceData.lastPullTime}}</span>
</el-descriptions-item>
<el-descriptions-item label="设备剩余电量">
{{deviceData.surplusEle | defaultValue}} 度
<el-descriptions-item label="设备总用电量">
{{deviceData.totalElectriQuantity | money | defaultValue}} 度
</el-descriptions-item>
</el-descriptions>
</el-card>
@ -125,7 +128,7 @@
<script>
import { addTime, getDevice, refreshIot, resetDevice, switchDevice, unbind } from '@/api/system/device'
import { addTime, getDevice, refreshIot, resetDevice, resetEleDevice, switchDevice, unbind } from '@/api/system/device'
import LineChart from "@/views/dashboard/LineChart.vue";
import RechargeRecord from "@/views/system/device/components/rechargeRecord.vue";
import QrCode from "@/components/QrCode/index.vue";
@ -242,7 +245,7 @@ export default {
return ((expireTime - now) / 1000).toFixed(2);
},
handleReset() {
this.$confirm('是否确认归零设备？', '警告', {
this.$confirm('是否确认归零设备时长？', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -255,6 +258,20 @@ export default {
})
})
},
handleResetEle() {
this.$confirm('是否确认归零设备电量？', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
resetEleDevice(this.deviceData.deviceId).then(res => {
if (res.code === 200) {
this.$message.success('操作成功');
this.getDevice();
}
})
})
},
handleAddElectricity() {
this.resetAddElectricityForm();
this.showAddElectricity = true;

34
src/views/system/recharge/detail.vue
View File

@ -21,9 +21,6 @@
<el-descriptions-item label="设备名称">
<device-link :id="detail.deviceId" :text="detail.deviceName"/>
</el-descriptions-item>
<el-descriptions-item label="设备充值状态">
<dict-tag :value="detail.deviceRechargeStatus" :options="dict.type.sm_transaction_bill_device_recharge_status" size="small"/>
</el-descriptions-item>
<el-descriptions-item label="套餐名称">{{detail.suitName | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="套餐计费模式">
@ -33,15 +30,20 @@
<dict-tag :value="detail.suitFeeType" :options="dict.type.suit_fee_type" size="small"/>
</el-descriptions-item>
<el-descriptions-item label="套餐时长" v-if="detail.suitFeeType === SuitFeeType.TIMING">{{detail.suitTime | defaultValue}} {{suitTimeUnit(detail.suitTimeUnit)}}</el-descriptions-item>
<el-descriptions-item label="套餐度数" v-if="detail.suitFeeType === SuitFeeType.COUNT">{{detail.suitTime | defaultValue}} 度</el-descriptions-item>
<el-descriptions-item label="套餐使用状态">
<el-tag size="small" :type="suitUsingType[suitStatus]">{{suitUsingText[suitStatus]}}</el-tag>
<el-descriptions-item label="套餐电量" v-if="detail.suitFeeType === SuitFeeType.COUNT">{{detail.suitTime | defaultValue}} 度</el-descriptions-item>
<el-descriptions-item label="设备充值状态" v-if="[SuitFeeType.TIMING, SuitFeeType.COUNT].includes(detail.suitFeeType)">
<dict-tag :value="detail.deviceRechargeStatus"
:options="dict.type.sm_transaction_bill_device_recharge_status"
size="small"/>
</el-descriptions-item>
<el-descriptions-item label="套餐开始时间">{{detail.suitStartTime | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="套餐结束时间">{{detail.suitEndTime | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="套餐失效时间">{{detail.suitExpireTime | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="套餐开始使用时总用电量">{{detail.suitStartEle | defaultValue}} W</el-descriptions-item>
<el-descriptions-item label="套餐结束使用时总用电量">{{detail.suitEndEle | defaultValue}} W</el-descriptions-item>
<el-descriptions-item label="套餐开始使用时设备总用电量">{{detail.suitStartEle | defaultValue}} 度</el-descriptions-item>
<el-descriptions-item label="套餐结束使用时设备总用电量">{{detail.suitEndEle | defaultValue}} 度</el-descriptions-item>
<el-descriptions-item label="当前设备总用电量" v-if="[SuitFeeType.TIME_COUNT].includes(detail.suitFeeType)">
{{detail.deviceTotalEle | money | defaultValue}} 度
</el-descriptions-item>
</el-descriptions>
</el-card>
@ -107,20 +109,6 @@ export default {
return findLabel(this.dict.type.time_unit, unit);
}
},
// 套餐状态
suitStatus() {
if (this.detail.billId == null) {
return 0;
}
let now = new Date().getTime();
if (now < new Date(this.detail.suitStartTime).getTime()) {
return 1;
} else if (now < new Date(this.detail.suitEndTime).getTime()) {
return 2;
} else {
return 3;
}
},
},
data() {
return {
@ -128,7 +116,7 @@ export default {
detail: {},
id: null,
suitUsingType: ['info', 'warning', 'success', 'danger'],
suitUsingText: ['未知', '未生效', '使用中', '已失效']
suitUsingText: ['未知', '未生效', '使用中', '已结束']
}
},
created() {

20
src/views/system/recharge/index.vue
View File

@ -119,7 +119,7 @@
</el-table-column>
<el-table-column label="手续费" align="center">
<template slot-scope="d">
{{d.row.serviceCharge | money}} 元
{{d.row.serviceCharge | money | defaultValue}} 元
</template>
</el-table-column>
<el-table-column label="成本" align="center">
@ -132,9 +132,14 @@
{{d.row.serviceCharge - d.row.channelCost | money}} 元
</template>
</el-table-column>
<el-table-column label="支付方式" align="center">
<el-table-column label="收费模式" align="center">
<template slot-scope="d">
<dict-tag :value="d.row.channelId" :options="dict.type.channel_type"/>
<dict-tag :value="d.row.suitFeeMode" :options="dict.type.suit_fee_mode"/>
</template>
</el-table-column>
<el-table-column label="收费方式" align="center">
<template slot-scope="d">
<dict-tag :value="d.row.suitFeeType" :options="dict.type.suit_fee_type"/>
</template>
</el-table-column>
<el-table-column label="交易状态" align="center">
@ -142,9 +147,9 @@
<dict-tag :value="d.row.status" :options="dict.type.sm_transaction_bill_status"/>
</template>
</el-table-column>
<el-table-column label="设备状态" align="center">
<el-table-column label="使用中" align="center">
<template slot-scope="d">
<dict-tag :value="d.row.deviceRechargeStatus" :options="dict.type.sm_transaction_bill_device_recharge_status"/>
<el-tag :type="d.row.isUsing ? 'success' : 'danger'">{{d.row.isUsing ? '是' : '否'}}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200">
@ -231,11 +236,12 @@ import {
import UserLink from '@/components/Business/SmUser/UserLink.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import RechargeLink from '@/components/Business/Transaction/RechargeLink.vue'
import { SuitFeeType } from '@/utils/constants'
export default {
name: "Bill",
components: { RechargeLink, DeviceLink, UserLink },
dicts: ['channel_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status'],
dicts: ['channel_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'suit_fee_mode', 'suit_fee_type'],
data() {
return {
// 遮罩层
@ -288,7 +294,7 @@ export default {
},
canRechargeDevice() {
return (row) => {
return row.status === '2' && row.deviceRechargeStatus !== '1';
return row.status === '2' && row.deviceRechargeStatus !== '1' && [SuitFeeType.TIMING, SuitFeeType.COUNT].includes(row.suitFeeType)
}
},
canRefund() {