充值订单

src/api/recruit/enterprise/member/points/index.js

@@ -16,6 +16,14 @@ export const getEnterpriseTradeOrderPage = async (params) => {
   })
 }
 
+// 获得货币账户充值记录分页
+export const getEnterpriseCurrencyRechargePage = async (params) => {
+  return await request.get({
+    url: '/app-api/pay/currency-recharge/page',
+    params
+  })
+}
+
 // 获得货币账户充值套餐列表
 export const getEnterpriseRechargePackageList = async (params) => {
   return await request.get({

src/utils/position.js

@@ -101,6 +101,8 @@ export const commissionCalculation = (count, type) => {
 
 // type: emit-> 提交（需要*100） realPay-> 回显（需要/100）
 export const payCalculation = (count, type) => {
+  if ((count - 0) === 0) return 0
+  if (!count) return ''
   const Magnification = type === 'emit' ? 100 : 1/100 
   return type === 'emit' ? (count - 0)*Magnification : ((count - 0)*Magnification).toFixed(2)
 }

src/views/recruit/enterprise/memberCenter/tradingOrder/index.vue

@@ -2,12 +2,13 @@
 <template>
   <div class="white-bgc pa-3 pt-3">
     <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
-      <v-tab :value="0">{{ '交易订单' }}</v-tab>
+      <v-tab value="tab_transaction">{{ '交易订单' }}</v-tab>
+      <v-tab value="tab_recharge">{{ '充值订单' }}</v-tab>
     </v-tabs>
     <CtTable
       class="mt-3"
       :items="dataList"
-      :headers="headers[tab]"
+      :headers="headersList[tab]"
       :loading="false"
       :elevation="0"
       :isTools="false"
@@ -23,44 +24,32 @@
 
 <script setup>
 defineOptions({name: 'enterprise-memberCenter-tradingOrder'})
-import { getEnterpriseTradeOrderPage } from '@/api/recruit/enterprise/member/points'
+import {
+  getEnterpriseTradeOrderPage,
+  getEnterpriseCurrencyRechargePage,
+} from '@/api/recruit/enterprise/member/points'
 import { ref } from 'vue'
 import { timesTampChange } from '@/utils/date'
 import { getDict } from '@/hooks/web/useDictionaries'
+import { payCalculation } from '@/utils/position'
 
-const tab = ref(0)
+const tab = ref('tab_transaction')
 const total = ref(0)
 const query = ref({
   pageNo: 1,
-  pageSize: 10
+  pageSize: 10,
+  payStatus: true, // 支付状态，订单数据true只显示已支付的
 })
 const dataList = ref([])
 
-// 支付渠道
-const channelData = ref([])
-const getPayChannelCode = async () => {
-  const { data } = await getDict('pay_channel_code')
-  channelData.value = data
-}
-getPayChannelCode()
-
-
-const orderHeaders = ref([
-  { title: '商品名称', key: 'spuName', sortable: false },
-  { title: '价格', key: 'price', sortable: false, value: item => item.price > 0 ? (item.price / 100.0).toFixed(2) : '' },
-  { title: '是否已支付', key: 'payStatus', sortable: false, value: item => item.payStatus ? '已支付' : '未支付' },
-  { title: '支付订单编号', key: 'payOrderId', sortable: false },
-  { title: '支付渠道', key: 'payChannelCode', value: item => channelData.value.find(e => e.value === item.payChannelCode)?.label, sortable: false },
-  { title: '订单支付时间', key: 'payTime', value: item =>  timesTampChange(item.payTime), sortable: false },
-  { title: '退款订单编号', key: 'payReFundId', sortable: false },
-  { title: '退款金额', key: 'refundPrice', sortable: false, value: item => item.refundPrice > 0 ? (item.refundPrice / 100.0).toFixed(2) : '' },
-  { title: '退款时间', key: 'refundTime', value: item =>  timesTampChange(item.refundTime), sortable: false },
-  { title: '更新时间', key: 'updateTime', value: item =>  timesTampChange(item.updateTime), sortable: false },
-])
-
 const getData = async () => {
-  const res = await getEnterpriseTradeOrderPage(query.value)
-  dataList.value = res.list
+  dataList.value = []; total.value = 0
+  const api = {
+    'tab_transaction': getEnterpriseTradeOrderPage,
+    'tab_recharge': getEnterpriseCurrencyRechargePage,
+  }
+  const res = await api[tab.value](query.value)
+  dataList.value = res?.list || []
   total.value = res.total
 }
 getData()
@@ -71,13 +60,70 @@ const handleChangePage = (e) => {
 }
 
 // 切换
-const handleChangeTab = () => {
+const handleChangeTab = (value) => {
+  tab.value = value
   query.value.pageNo = 1
-  query.value.type = tab.value
+  initDict()
   getData()
 }
 
-const headers = ref([orderHeaders.value])
+const headersList = {
+  tab_transaction: [
+    { title: '商品名称', key: 'spuName', sortable: false },
+    { title: '价格', key: 'price', sortable: false, value: item => payCalculation(item.price, 'realPay') },
+    { title: '是否已支付', key: 'payStatus', sortable: false, value: item => item.payStatus ? '已支付' : '未支付' },
+    { title: '支付订单编号', key: 'payOrderId', sortable: false },
+    { title: '支付渠道', key: 'payChannelCode', value: item => channelData.value.find(e => e.value === item.payChannelCode)?.label, sortable: false },
+    { title: '订单支付时间', key: 'payTime', value: item =>  timesTampChange(item.payTime), sortable: false },
+    { title: '退款订单编号', key: 'payReFundId', sortable: false },
+    { title: '退款金额', key: 'refundPrice', sortable: false, value: item => payCalculation(item.refundPrice, 'realPay') },
+    { title: '退款时间', key: 'refundTime', value: item =>  timesTampChange(item.refundTime), sortable: false },
+    { title: '更新时间', key: 'updateTime', value: item =>  timesTampChange(item.updateTime), sortable: false },
+  ],
+  tab_recharge: [
+    { title: '订单支付时间', key: 'payTime', value: item =>  timesTampChange(item.payTime), sortable: false },
+    { title: '实际支付金额', key: 'payPrice', value: item => payCalculation(item.payPrice, 'realPay'), sortable: false },
+    { title: '支付渠道名', key: 'payChannelName', sortable: false },
+    { title: '支付成功的外部订单号', key: 'payOrderChannelOrderNo', sortable: false },
+    // { title: '支付状态', key: 'payStatus', sortable: false },
+    { title: '退款状态', key: 'refundStatus', value: item => pay_refund_status.value.find(e => e.value-0 === item.refundStatus-0)?.label, sortable: false },
+    // { title: '用户实际到账余额', key: 'totalPrice', value: item => payCalculation(item.totalPrice, 'realPay'), sortable: false },
+    // { title: '赠送金额', key: 'bonusPrice', value: item => payCalculation(item.bonusPrice, 'realPay'), sortable: false },
+    // { title: '编号', key: 'id', sortable: false },
+    // { title: '支付成功的支付渠道', key: 'payChannelCode', sortable: false },
+    // { title: '支付订单编号', key: 'payOrderId', sortable: false },
+  ],
+}
+
+// 字典查询
+
+// 支付渠道
+const channelData = ref([])
+const getPayChannelCode = async () => {
+  const { data } = await getDict('pay_channel_code')
+  channelData.value = data
+}
+
+// 退款订单状态
+const pay_refund_status = ref([])
+const get_pay_refund_status = async () => {
+  const { data } = await getDict('pay_refund_status')
+  pay_refund_status.value = data
+}
+
+// // 交易订单取消类型 
+// const menduner_trade_order_cancel_type = ref([])
+// const get_menduner_trade_order_cancel_type = async () => {
+//   const { data } = await getDict('menduner_trade_order_cancel_type')
+//   menduner_trade_order_cancel_type.value = data
+// }
+
+const initDict = () => { // 对应标签下的字典
+  if (tab.value === 'tab_transaction') getPayChannelCode()
+  if (tab.value === 'tab_recharge') get_pay_refund_status()
+}
+initDict()
+
 </script>
 <style lang="scss" scoped>
 </style>