feat：【mall 商城】门店自提的迁移（antd 50%）

apps/web-antd/src/api/mall/trade/order/index.ts

@@ -284,7 +284,7 @@ export function pickUpOrder(id: number) {
 
 /** 订单核销 */
 export function pickUpOrderByVerifyCode(pickUpVerifyCode: string) {
-  return requestClient.put('/trade/order/pick-up-by-verify-code', {
+  return requestClient.put('/trade/order/pick-up-by-verify-code', undefined, {
     params: { pickUpVerifyCode },
   });
 }

apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts

@@ -4,15 +4,24 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU
 
 import { ref } from 'vue';
 
-import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
 
 import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';
 import { getRangePickerDefaultProps } from '#/utils';
 
+// TODO @芋艿：统一风格；
+const userStore = useUserStore();
 const pickUpStoreList = ref<MallDeliveryPickUpStoreApi.PickUpStore[]>([]);
 
+/** 自提门店列表 */
 getSimpleDeliveryPickUpStoreList().then((res) => {
   pickUpStoreList.value = res;
+  // 移除自己无法核销的门店
+  const userId = userStore?.userInfo?.id;
+  pickUpStoreList.value = pickUpStoreList.value.filter((item) =>
+    item.verifyUserIds?.includes(userId),
+  );
 });
 
 /** 列表的搜索表单 */
@@ -28,20 +37,53 @@ export function useGridFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      fieldName: 'pickUpStoreId',
+      fieldName: 'pickUpStoreIds',
       label: '自提门店',
-      component: 'ApiSelect',
+      component: 'Select',
       componentProps: {
-        api: getSimpleDeliveryPickUpStoreList,
+        options: pickUpStoreList,
         fieldNames: {
           label: 'name',
           value: 'id',
         },
+        placeholder: '请选择自提门店',
       },
-      dependencies: {
+      defaultValue: pickUpStoreList.value[0]?.id,
-        triggerFields: ['deliveryType'],
+    },
-        trigger: (values) =>
+    {
-          values.deliveryType === DeliveryTypeEnum.PICK_UP.type,
+      fieldName: 'no',
+      label: '订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入订单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'userId',
+      label: '用户 UID',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户 UID',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'userNickname',
+      label: '用户昵称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户昵称',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'userMobile',
+      label: '用户电话',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户电话',
+        allowClear: true,
       },
     },
   ];

apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue

@@ -2,19 +2,20 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallOrderApi } from '#/api/mall/trade/order';
 
-import { h, onMounted, ref } from 'vue';
+import { h, ref } from 'vue';
 
 import { Page, prompt } from '@vben/common-ui';
-import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants';
+import { DeliveryTypeEnum } from '@vben/constants';
+import { $t } from '@vben/locales';
 import { fenToYuan } from '@vben/utils';
 
 import { Card, Input, message } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
-  getOrderByPickUpVerifyCode,
   getOrderPage,
   getOrderSummary,
+  pickUpOrderByVerifyCode,
 } from '#/api/mall/trade/order';
 import { SummaryCard } from '#/components/summary-card';
 
@@ -22,6 +23,11 @@ import { useGridColumns, useGridFormSchema } from './data';
 
 const summary = ref<MallOrderApi.OrderSummary>();
 
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
 /** 获取订单统计数据 */
 async function getOrderSum() {
   const query = await gridApi.formApi.getValues();
@@ -31,6 +37,7 @@ async function getOrderSum() {
 
 /** 核销订单 */
 async function handlePickup(pickUpVerifyCode?: string) {
+  // 如果没有传核销码，则弹窗输入
   if (!pickUpVerifyCode) {
     await prompt({
       component: () => {
@@ -48,13 +55,18 @@ async function handlePickup(pickUpVerifyCode?: string) {
   if (!pickUpVerifyCode) {
     return;
   }
-  const data = await getOrderByPickUpVerifyCode(pickUpVerifyCode);
+
-  if (data?.deliveryType !== DeliveryTypeEnum.PICK_UP.type) {
+  // 执行核销
-    message.error('未查询到订单');
+  const hideLoading = message.loading({
-    return;
+    content: '订单核销中 ...',
-  }
+    duration: 0,
-  if (data?.status !== TradeOrderStatusEnum.UNDELIVERED.status) {
+  });
-    message.error('订单不是待核销状态');
+  try {
+    await pickUpOrderByVerifyCode(pickUpVerifyCode);
+    message.success($t('ui.actionMessage.operationSuccess'));
+    handleRefresh();
+  } finally {
+    hideLoading();
   }
 }
 
@@ -64,7 +76,6 @@ const reader = ref('');
 const serialPort = ref(false); // 是否连接扫码枪
 
 /** 连接扫码枪 */
-// TODO @AI：晚点搞！
 async function connectToSerialPort() {
   try {
     // 判断浏览器支持串口通信
@@ -81,7 +92,7 @@ async function connectToSerialPort() {
       return;
     }
 
-    // 获取用户之前授予该网站访问权限的所有串口。
+    // 获取用户之前授予该网站访问权限的所有串口
     ports.value = await (navigator.serial as any).getPorts();
 
     // 等待串口打开
@@ -93,7 +104,7 @@ async function connectToSerialPort() {
 
     message.success('成功连接扫码枪');
     serialPort.value = true;
-    readData();
+    await readData();
   } catch (error) {
     // 处理连接串口出错的情况
     console.error('Error connecting to serial port:', error);
@@ -121,11 +132,12 @@ async function readData() {
       data = ''; // 清空下次读取不会叠加
       console.warn(`二维码数据:${codeData}`);
       // 处理拿到数据逻辑
-      handlePickup(codeData);
+      await handlePickup(codeData);
     }
   }
 }
 
+/** 断开扫码枪连接 */
 async function cutPort() {
   if (port.value === '') {
     message.warning('请先连接或打开扫码枪');
@@ -141,8 +153,6 @@ async function cutPort() {
 
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
-    // TODO @AI：需要移除自己不能门店自提的店铺；
-    // TODO @AI：默认选中第一个！
     schema: useGridFormSchema(),
   },
   gridOptions: {
@@ -152,7 +162,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          // TODO @AI：有个“聚合搜索”，可以拆解成多个表单；
+          await getOrderSum();
           return await getOrderPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
@@ -172,10 +182,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<MallOrderApi.Order>,
 });
-
-onMounted(() => {
-  getOrderSum();
-});
 </script>
 
 <template>