feat：创建快递订单

src/api/mall/trade/order/index.ts

@@ -141,7 +141,7 @@ export const getExpressTrackList = async (id: number | null) => {
 }
 
 export interface DeliveryVO {
-  id?: number // 订单编号
+  id: number // 订单编号
   logisticsId: number | null // 物流公司编号
   logisticsNo: string // 物流编号
 }
@@ -151,6 +151,10 @@ export const deliveryOrder = async (data: DeliveryVO) => {
   return await request.put({ url: `/trade/order/delivery`, data })
 }
 
+//申通快递（快递100）订单创建
+export const deliveryOrder100 = async (data: { id: number }) => {
+  return await request.put({ url: `/trade/order/delivery-kuaidi100?id=${data.id}`, data })
+}
 // 订单备注
 export const updateOrderRemark = async (data: any) => {
   return await request.put({ url: `/trade/order/update-remark`, data })

src/views/mall/trade/order/form/OrderDeliveryForm.vue

@@ -7,21 +7,6 @@
           <el-radio border value="none">无需发货</el-radio>
         </el-radio-group>
       </el-form-item>
-      <template v-if="expressType === 'express'">
-        <el-form-item label="物流公司">
-          <el-select v-model="formData.logisticsId" placeholder="请选择" style="width: 100%">
-            <el-option
-              v-for="item in deliveryExpressList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物流单号">
-          <el-input v-model="formData.logisticsNo" />
-        </el-form-item>
-      </template>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -30,9 +15,9 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
+// import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
 import * as TradeOrderApi from '@/api/mall/trade/order'
-import { copyValueToTarget } from '@/utils'
+// import { copyValueToTarget } from '@/utils'
 
 defineOptions({ name: 'OrderDeliveryForm' })
 
@@ -42,21 +27,17 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const expressType = ref('express') // 如果值是 express，则是快递；none 则是无；未来做同城配送；
-const formData = ref<TradeOrderApi.DeliveryVO>({
+const formData = ref({
   id: undefined, // 订单编号
-  logisticsId: null, // 物流公司编号
-  logisticsNo: '' // 物流编号
+
 })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (row: TradeOrderApi.OrderVO) => {
+const open = async (orderId: number) => {
   resetForm()
-  // 设置数据
-  copyValueToTarget(formData.value, row)
-  if (row.logisticsId === 0) {
-    expressType.value = 'none'
-  }
+  // 设置订单ID
+formData.value = { ...formData.value, id: orderId }
   dialogVisible.value = true
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -68,15 +49,18 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = unref(formData)
-    if (expressType.value === 'none') {
-      // 无需发货的情况
-      data.logisticsId = 0
-      data.logisticsNo = ''
+
+    if (expressType.value === 'express' && data.id) {
+      // 选择快递物流时调用快递100接口
+      await TradeOrderApi.deliveryOrder100({ id: data.id })
+    } else if (expressType.value === 'none' && data.id) {
+      // 选择无需发货时调用无需发货接口
+      message.info(t('无需发货'))
     }
-    await TradeOrderApi.deliveryOrder(data)
-    message.success(t('common.updateSuccess'))
+
+    // message.success(t('common.updateSuccess'))
     dialogVisible.value = false
-    // 发送操作成功的事件
+    // // 发送操作成功的事件
     emit('success', true)
   } finally {
     formLoading.value = false
@@ -87,13 +71,13 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined, // 订单编号
-    logisticsId: null, // 物流公司编号
-    logisticsNo: '' // 物流编号
+    // logisticsId: null, // 物流公司编号
+    // logisticsNo: '' // 物流编号
   }
   formRef.value?.resetFields()
 }
-const deliveryExpressList = ref([])
+// const deliveryExpressList = ref([])
 onMounted(async () => {
-  deliveryExpressList.value = await DeliveryExpressApi.getSimpleDeliveryExpressList()
+  // deliveryExpressList.value = await DeliveryExpressApi.getSimpleDeliveryExpressList()
 })
 </script>

src/views/mall/trade/order/index.vue

@@ -248,6 +248,7 @@ const queryFormRef = ref<FormInstance>() // 搜索的表单
 const queryParams = ref({
   pageNo: 1, // 页数
   pageSize: 10, // 每页显示数量
+  id:undefined, // 订单ID
   status: undefined, // 订单状态
   payChannelCode: undefined, // 支付方式
   createTime: undefined, // 创建时间
@@ -287,6 +288,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await TradeOrderApi.getOrderPage(unref(queryParams))
+    console.log('订单列表', data.list)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -306,6 +308,7 @@ const resetQuery = () => {
   queryParams.value = {
     pageNo: 1, // 页数
     pageSize: 10, // 每页显示数量
+    id: undefined, // 订单ID
     status: undefined, // 订单状态
     payChannelCode: undefined, // 支付方式
     createTime: undefined, // 创建时间
@@ -333,7 +336,7 @@ const handleCommand = (command: string, row: TradeOrderApi.OrderVO) => {
       updateRemarkForm.value?.open(row)
       break
     case 'delivery':
-      deliveryFormRef.value?.open(row)
+      deliveryFormRef.value?.open(row.id) // 直接传递id而不是整个row对象
       break
   }
 }