feat(shop): 新增线下付款支持及优化Dashboard数据统计

- 新增线下付款(payType=9)支付方式，支持订单中标识和确认收款操作 - 实现商家确认线下付款后订单进入待发货状态功能 - 更新支付方式组件和订单列表及详情页的支付状态显示 - 优化shop/dashboard快捷操作按钮为商城常用功能，修正快速入口路由路径 - 修复Dashboard待发货订单数统计时未过滤商城订单导致数据不准的问题 - 修复Dashboard运行天数为0的异常，将租户信息请求独立处理，避免某些请求失败影响 - 修复statisticsStore中couponUsedCount与getter同名冲突，改名为safeCouponUsedCount并同步更新引用
2026-07-14 22:17:39 +08:00
parent 5106fe101c
commit 894592c290
11 changed files with 217 additions and 46 deletions
--- a/src/api/shop/shopOrder/index.ts
+++ b/src/api/shop/shopOrder/index.ts
@@ -150,3 +150,19 @@ export async function refundShopOrder(data: ShopOrder) {
  }
  return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 确认线下付款收款
+ * 商家确认已收到线下转账（微信转账/银行汇款等），确认后订单进入待发货状态
+ */
+export async function confirmOfflinePayment(id: number, remarks?: string) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-order/confirm-offline-payment/' + id,
+    null,
+    { params: { remarks } }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
--- a/src/api/shop/shopOrder/model/index.ts
+++ b/src/api/shop/shopOrder/model/index.ts
@@ -85,9 +85,9 @@ export interface ShopOrder {
  coachId?: number;
  // 支付的用户id
  payUserId?: number;
-  // 0余额支付, 1微信支付, 2支付宝, 3银联支付, 4现金支付, 5POS机支付, 6免费, 7积分支付, 8货到付款, 9~18 已废弃
+  // 0余额支付, 1微信支付, 2支付宝, 3银联支付, 4现金支付, 5POS机支付, 6免费, 7积分支付, 8货到付款, 9线下付款, 10~18 已废弃
  payType?: number;
-  // 代付支付方式, 0余额支付, 1微信支付, 2支付宝, 3银联支付, 4现金支付, 5POS机支付, 6免费, 7积分支付, 8货到付款, 9~18 已废弃
+  // 代付支付方式, 0余额支付, 1微信支付, 2支付宝, 3银联支付, 4现金支付, 5POS机支付, 6免费, 7积分支付, 8货到付款, 9线下付款, 10~18 已废弃
  friendPayType?: number;
  // 0未付款，1已付款
  payStatus?: number;
--- a/src/components/PayMethod/index.vue
+++ b/src/components/PayMethod/index.vue
@@ -84,6 +84,12 @@
      label: '货到付款',
      key: 'codPay',
      icon: 'IdcardOutlined'
+    },
+    {
+      value: 9,
+      label: '线下付款',
+      key: 'offlinePay',
+      icon: 'IdcardOutlined'
    }
  ]);

--- a/src/store/modules/statistics.ts
+++ b/src/store/modules/statistics.ts
@@ -90,9 +90,9 @@ export const useStatisticsStore = defineStore('statistics', {
    },

    /**
-     * 获取今日使用优惠券数量
+     * 获取今日使用优惠券数量（安全取值）
     */
-    couponUsedCount: (state): number => {
+    safeCouponUsedCount: (state): number => {
      return safeNumber(state.couponUsedCount);
    },

--- a/src/utils/shop.ts
+++ b/src/utils/shop.ts
@@ -36,6 +36,10 @@ export function getPayType(index?: number): any {
    {
      value: 8,
      label: '货到付款'
+    },
+    {
+      value: 9,
+      label: '线下付款'
    }
  ];
  if (index != null) {
--- a/src/views/cms/dashboard/index.vue
+++ b/src/views/cms/dashboard/index.vue
@@ -213,11 +213,14 @@
  import { openNew } from '@/utils/common';
  import { useSiteStore } from '@/store/modules/site';
  import { useStatisticsStore } from '@/store/modules/statistics';
+  import { useUserStore } from '@/store/modules/user';
+  import { getTenantInfo } from '@/api/layout';
  import { storeToRefs } from 'pinia';

  // 使用状态管理
  const siteStore = useSiteStore();
  const statisticsStore = useStatisticsStore();
+  const userStore = useUserStore();

  // 从 store 中获取响应式数据
  const { siteInfo, loading: siteLoading } = storeToRefs(siteStore);
@@ -238,7 +241,13 @@
  });

  // 计算属性
-  const runDays = computed(() => siteStore.runDays);
+  const now = ref(Date.now());
+  const tenantCreateTime = ref<string>('');
+  let runDaysTimer: ReturnType<typeof setInterval>;
+  const runDays = computed(() => {
+    if (!tenantCreateTime.value) return 0;
+    return Math.floor((now.value - new Date(tenantCreateTime.value).getTime()) / (24 * 60 * 60 * 1000));
+  });
  const userCount = computed(() => statisticsStore.userCount);
  const orderCount = computed(() => statisticsStore.orderCount);
  const totalSales = computed(() => statisticsStore.totalSales);
@@ -248,6 +257,15 @@

  // 加载数据
  const loadData = async () => {
+    // 独立请求租户信息，不受其他请求失败影响
+    getTenantInfo()
+      .then((res) => {
+        tenantCreateTime.value = res?.createTime || '';
+      })
+      .catch((e) => {
+        console.warn('获取租户信息失败:', e);
+      });
+
    try {
      await Promise.all([
        siteStore.fetchSiteInfo(),
@@ -267,11 +285,14 @@
    await loadData();
    // 开始自动刷新统计数据（每5分钟）
    statisticsStore.startAutoRefresh();
+    // 运行天数每小时检查一次（跨天自动更新）
+    runDaysTimer = setInterval(() => { now.value = Date.now(); }, 60 * 60 * 1000);
  });

  onUnmounted(() => {
    // 组件卸载时停止自动刷新
    statisticsStore.stopAutoRefresh();
+    clearInterval(runDaysTimer);
  });
 </script>

--- a/src/views/shop/dashboard/index.vue
+++ b/src/views/shop/dashboard/index.vue
@@ -180,27 +180,30 @@
              <a-button
                type="primary"
                block
-                @click="navigateTo('/website/field')"
-                :loading="loading"
+                @click="navigateTo('/shop/shopOrder')"
              >
-                <UngroupOutlined />
-                参数配置
-              </a-button>
-              <a-button block @click="navigateTo('/shop/shopOrder')">
-                <CalendarOutlined />
+                <ShoppingCartOutlined />
                订单管理
              </a-button>
-              <a-button block @click="navigateTo('/system/user')">
-                <UserOutlined />
-                用户管理
-              </a-button>
-              <a-button block @click="navigateTo('/website/index')">
+              <a-button block @click="navigateTo('/shop/shopGoods')">
                <ShopOutlined />
-                站点管理
+                商品管理
              </a-button>
-              <a-button block @click="navigateTo('/system/login-record')">
-                <FileTextOutlined />
-                登录日志
+              <a-button block @click="navigateTo('/shop/shopGoodsCategory')">
+                <AppstoreOutlined />
+                商品分类
+              </a-button>
+              <a-button block @click="navigateTo('/shop/shopCoupon')">
+                <GiftOutlined />
+                优惠券管理
+              </a-button>
+              <a-button block @click="navigateTo('/shop/shopUser')">
+                <TeamOutlined />
+                会员管理
+              </a-button>
+              <a-button block @click="navigateTo('/shop/shopSetting')">
+                <SettingOutlined />
+                商城设置
              </a-button>
              <a-button block @click="handleClearCache">
                <ClearOutlined />
@@ -221,11 +224,12 @@ import { useOrderNotify } from '@/views/shop/shopOrder/useOrderNotify';
 import {
  ReloadOutlined,
  RightOutlined,
-  UngroupOutlined,
-  CalendarOutlined,
-  UserOutlined,
+  ShoppingCartOutlined,
  ShopOutlined,
-  FileTextOutlined,
+  AppstoreOutlined,
+  GiftOutlined,
+  TeamOutlined,
+  SettingOutlined,
  ClearOutlined,
  InfoCircleOutlined
 } from '@ant-design/icons-vue';
@@ -234,6 +238,7 @@ import { useSiteStore } from '@/store/modules/site';
 import { useStatisticsStore } from '@/store/modules/statistics';
 import { useUserStore } from '@/store/modules/user';
 import { pageShopOrder } from '@/api/shop/shopOrder';
+import { getTenantInfo } from '@/api/layout';
 import { storeToRefs } from 'pinia';
 import { removeSiteInfoCache } from '@/api/cms/cmsWebsite';

@@ -257,7 +262,13 @@ const systemInfo = reactive({
 });

 // 计算属性
-const runDays = computed(() => siteStore.runDays);
+const now = ref(Date.now());
+const tenantCreateTime = ref<string>('');
+let runDaysTimer: ReturnType<typeof setInterval>;
+const runDays = computed(() => {
+  if (!tenantCreateTime.value) return 0;
+  return Math.floor((now.value - new Date(tenantCreateTime.value).getTime()) / (24 * 60 * 60 * 1000));
+});
 const userCount = computed(() => statisticsStore.userCount);
 const orderCount = computed(() => statisticsStore.orderCount);
 const totalSales = computed(() => statisticsStore.totalSales);
@@ -279,7 +290,7 @@ const coreStats = computed(() => [
 // 待处理事项数据
 const pendingShipmentCount = ref(0);
 const pendingRefundCount = ref(0);
-const couponUsedCount = computed(() => statisticsStore.couponUsedCount);
+const couponUsedCount = computed(() => statisticsStore.safeCouponUsedCount);

 // 待处理事项（使用computed确保响应式更新）
 const todoItems = computed(() => [
@@ -298,12 +309,12 @@ const todayStats = computed(() => ({

 // 快速入口
 const quickLinks = [
-  { to: '/website/field', icon: '⚙️', label: '参数配置', bg: '#eff6ff' },
  { to: '/shop/shopOrder', icon: '📦', label: '订单管理', bg: '#f0fdf4' },
-  { to: '/system/user', icon: '👥', label: '用户管理', bg: '#fff7ed' },
-  { to: '/website/index', icon: '🏪', label: '站点管理', bg: '#faf5ff' },
-  { to: '/shopGoods', icon: '🏸', label: '商品管理', bg: '#ecfdf5' },
-  { to: '/cmsArticle', icon: '📝', label: '文章管理', bg: '#fefce8' },
+  { to: '/shop/shopGoods', icon: '🏸', label: '商品管理', bg: '#ecfdf5' },
+  { to: '/shop/shopGoodsCategory', icon: '🗂️', label: '商品分类', bg: '#eff6ff' },
+  { to: '/shop/shopCoupon', icon: '🎁', label: '优惠券', bg: '#fff7ed' },
+  { to: '/shop/shopUser', icon: '👥', label: '会员管理', bg: '#faf5ff' },
+  { to: '/shop/shopSetting', icon: '⚙️', label: '商城设置', bg: '#fefce8' },
 ];

 // 导航跳转
@@ -348,6 +359,15 @@ const refreshStatistics = async () => {

 // 加载数据
 const loadData = async () => {
+  // 独立请求租户信息，不受其他请求失败影响
+  getTenantInfo()
+    .then((res) => {
+      tenantCreateTime.value = res?.createTime || '';
+    })
+    .catch((e) => {
+      console.warn('获取租户信息失败:', e);
+    });
+
  try {
    await Promise.all([
      siteStore.fetchSiteInfo(),
@@ -356,8 +376,9 @@ const loadData = async () => {

    // 获取待处理事项数据
    try {
-      // 获取待发货订单数（使用 statusFilter=1 对应待发货）
+      // 获取待发货订单数（type=0商城订单, statusFilter=1待发货）
      const shipmentResult = await pageShopOrder({
+        type: 0,
        statusFilter: 1,
        page: 1,
        limit: 1
@@ -369,8 +390,9 @@ const loadData = async () => {
    }

    try {
-      // 获取退款/售后订单数（使用 statusFilter=6 对应退款/售后）
+      // 获取退款/售后订单数（type=0商城订单, statusFilter=6退款/售后）
      const refundResult = await pageShopOrder({
+        type: 0,
        statusFilter: 6,
        page: 1,
        limit: 1
@@ -391,11 +413,15 @@ onMounted(async () => {

  // 开始自动刷新统计数据（每5分钟）
  statisticsStore.startAutoRefresh();
+
+  // 运行天数每小时检查一次（跨天自动更新）
+  runDaysTimer = setInterval(() => { now.value = Date.now(); }, 60 * 60 * 1000);
 });

 onUnmounted(() => {
  // 组件卸载时停止自动刷新
  statisticsStore.stopAutoRefresh();
+  clearInterval(runDaysTimer);
 });
 </script>

--- a/src/views/shop/shopOrder/components/orderInfo.vue
+++ b/src/views/shop/shopOrder/components/orderInfo.vue
@@ -71,9 +71,11 @@
          label="支付状态"
          :labelStyle="{ width: '90px', color: '#808080' }"
        >
-          <a-tag v-if="form.payStatus == 1 && form.payType !== 8" color="green">已付款</a-tag>
+          <a-tag v-if="form.payStatus == 1 && form.payType !== 8 && form.payType !== 9" color="green">已付款</a-tag>
          <a-tag v-if="form.payStatus == 1 && form.payType === 8" color="blue">待收货付款</a-tag>
-          <a-tag v-if="form.payStatus == 0">未付款</a-tag>
+          <a-tag v-if="form.payStatus == 1 && form.payType === 9" color="green">已确认收款</a-tag>
+          <a-tag v-if="form.payStatus == 0 && form.payType === 9" color="orange">待确认收款</a-tag>
+          <a-tag v-if="form.payStatus == 0 && form.payType !== 9">未付款</a-tag>
          <a-tag v-if="form.payStatus == 3">未付款,占场中</a-tag>
        </a-descriptions-item>
        <!-- 第四排-->
@@ -147,7 +149,7 @@
              </a-tag>
              <a-tag v-if="form.payType == 9">
                <IdcardOutlined class="tag-icon" />
-                IC月卡
+                线下付款
              </a-tag>
              <a-tag v-if="form.payType == 10">
                <IdcardOutlined class="tag-icon" />
@@ -187,7 +189,16 @@
              </a-tag>
            </template>
            <template v-else>
-              <span class="text-gray-400">未支付</span>
+              <!-- 线下付款未确认时也显示支付方式 -->
+              <a-tag v-if="form.payType == 9">
+                <IdcardOutlined class="tag-icon" />
+                线下付款
+              </a-tag>
+              <a-tag v-if="form.payType == 8">
+                <IdcardOutlined class="tag-icon" />
+                货到付款
+              </a-tag>
+              <span v-if="form.payType !== 9 && form.payType !== 8" class="text-gray-400">未支付</span>
            </template>
          </a-tooltip>
        </a-descriptions-item>
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -93,10 +93,15 @@
                  v-if="record.payType === 8"
                  color="blue"
                >货到付款</a-tag>
+                <!-- 线下付款标识 -->
+                <a-tag
+                  v-if="record.payType === 9"
+                  color="orange"
+                >线下付款</a-tag>

                <!-- 支付状态 -->
                <a-tag
-                  v-if="record.payStatus == 1 && record.payType !== 8"
+                  v-if="record.payStatus == 1 && record.payType !== 8 && record.payType !== 9"
                  color="green"
                  @click.stop="updatePayStatus(record)"
                  class="cursor-pointer"
@@ -109,6 +114,20 @@
                  class="cursor-pointer"
                  >待收货付款</a-tag
                >
+                <a-tag
+                  v-else-if="record.payStatus == 1 && record.payType === 9"
+                  color="green"
+                  @click.stop="updatePayStatus(record)"
+                  class="cursor-pointer"
+                  >已确认收款</a-tag
+                >
+                <a-tag
+                  v-else-if="record.payStatus == 0 && record.payType === 9"
+                  color="orange"
+                  @click.stop="updatePayStatus(record)"
+                  class="cursor-pointer"
+                  >待确认收款</a-tag
+                >
                <a-tag
                  v-else-if="record.payStatus == 0 || record.payStatus == null"
                  @click.stop="updatePayStatus(record)"
@@ -185,6 +204,10 @@
            <template v-if="record.payType === 8">
              <a-tag color="blue">货到付款</a-tag>
            </template>
+            <!-- 线下付款特殊标识 -->
+            <template v-else-if="record.payType === 9">
+              <a-tag color="orange">线下付款</a-tag>
+            </template>
            <template v-else>
              <template v-for="item in getPayType()">
                <template v-if="record.payStatus == 1">
@@ -230,8 +253,8 @@
              <!-- 查看详情 - 所有状态都可以查看 -->
              <a @click.stop="openEdit(record)"> <EyeOutlined /> 详情 </a>

-              <!-- 未付款状态的操作 -->
-              <template v-if="!record.payStatus && record.orderStatus === 0">
+              <!-- 未付款状态的操作（排除线下付款） -->
+              <template v-if="!record.payStatus && record.orderStatus === 0 && record.payType !== 9">
                <a @click.stop="handleEditOrder(record)">
                  <EditOutlined /> 修改
                </a>
@@ -240,6 +263,16 @@
                </a>
              </template>

+              <!-- 线下付款·待确认收款状态的操作 -->
+              <template v-if="!record.payStatus && record.orderStatus === 0 && record.payType === 9">
+                <a @click.stop="handleConfirmOfflinePayment(record)" class="ele-text-success">
+                  <CheckCircleOutlined /> 确认收款
+                </a>
+                <a @click.stop="handleCancelOrder(record)">
+                  <span class="ele-text-warning"> <CloseOutlined /> 关闭 </span>
+                </a>
+              </template>
+
              <!-- 已付款未发货状态的操作 -->
              <template
                v-if="
@@ -371,7 +404,8 @@
    repairOrder,
    removeShopOrder,
    removeBatchShopOrder,
-    updateShopOrder, refundShopOrder
+    updateShopOrder, refundShopOrder,
+    confirmOfflinePayment
  } from '@/api/shop/shopOrder';
  import { updateUser } from '@/api/system/user';
  import { getPayType } from '@/utils/shop';
@@ -627,6 +661,35 @@
    });
  };

+  // 确认线下付款收款
+  const handleConfirmOfflinePayment = (record: ShopOrder) => {
+    let remarksValue = '';
+    Modal.confirm({
+      title: '确认线下收款',
+      content: createVNode('div', null, [
+        createVNode('p', { style: 'margin-bottom: 8px' }, '确认已收到该订单的线下付款（微信转账/银行汇款等）？'),
+        createVNode('p', { style: 'margin-bottom: 8px; color: #999; font-size: 12px' }, `订单号：${record.orderNo}`),
+        createVNode('input', {
+          id: 'offline-remarks-input',
+          placeholder: '可填写备注（如：微信转账已收到）',
+          style: 'width: 100%; padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px;',
+          onInput: (e: any) => { remarksValue = e.target.value; }
+        })
+      ]),
+      okText: '确认收款',
+      okType: 'success',
+      onOk: async () => {
+        try {
+          await confirmOfflinePayment(record.orderId!, remarksValue || undefined);
+          message.success('确认收款成功，订单已进入待发货状态');
+          reload();
+        } catch (error: any) {
+          message.error(error.message || '确认收款失败');
+        }
+      }
+    });
+  };
+
  // 发货处理
  const handleDelivery = (record: ShopOrder) => {
    current.value = record;
--- a/src/views/shop/shopSetting/index.vue
+++ b/src/views/shop/shopSetting/index.vue
@@ -17,9 +17,9 @@
        <a-tab-pane tab="分销设置" key="dealer">
          <Dealer />
        </a-tab-pane>
-        <a-tab-pane tab="支付设置" key="payment">
-          <Payment />
-        </a-tab-pane>
+<!--        <a-tab-pane tab="支付设置" key="payment">-->
+<!--          <Payment />-->
+<!--        </a-tab-pane>-->
        <a-tab-pane tab="通知设置" key="notify">
          <Notify />
        </a-tab-pane>
@@ -43,7 +43,7 @@ import Basic from './components/basic.vue';
 import Order from './components/order.vue';
 import Points from './components/points.vue';
 import Dealer from './components/dealer.vue';
-import Payment from './components/payment.vue';
+// import Payment from './components/payment.vue';
 import Notify from './components/notify.vue';
 import Upload from './components/upload.vue';
 import Sms from './components/sms.vue';