trade：完善订单详情

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

@@ -41,15 +41,22 @@ export interface OrderVO {
   refundPrice?: number | null // 退款金额
   refundPrice?: number | null // 退款金额
   couponId?: number | null // 优惠劵编号
   couponId?: number | null // 优惠劵编号
   couponPrice?: number | null // 优惠劵减免金额
   couponPrice?: number | null // 优惠劵减免金额
+  vipPrice?: number | null // VIP 减免金额
   pointPrice?: number | null // 积分抵扣的金额
   pointPrice?: number | null // 积分抵扣的金额
   receiverAreaName?: string //收件人地区名字
   receiverAreaName?: string //收件人地区名字
   items?: OrderItemRespVO[] // 订单项列表
   items?: OrderItemRespVO[] // 订单项列表
-  // 用户信息
+  // 下单用户信息
   user?: {
   user?: {
     id?: number | null
     id?: number | null
     nickname?: string
     nickname?: string
     avatar?: string
     avatar?: string
   }
   }
+  // 推广用户信息
+  brokerageUser?: {
+    id?: number | null
+    nickname?: string
+    avatar?: string
+  }
   // 订单操作日志
   // 订单操作日志
   logs?: OrderLogRespVO[]
   logs?: OrderLogRespVO[]
 }
 }
@@ -114,21 +121,21 @@ export interface DeliveryVO {
 }
 }
 
 
 // 订单发货
 // 订单发货
-export const delivery = async (data: DeliveryVO) => {
+export const deliveryOrder = async (data: DeliveryVO) => {
   return await request.put({ url: `/trade/order/delivery`, data })
   return await request.put({ url: `/trade/order/delivery`, data })
 }
 }
 
 
 // 订单备注
 // 订单备注
-export const updateRemark = async (data: any) => {
+export const updateOrderRemark = async (data: any) => {
   return await request.put({ url: `/trade/order/update-remark`, data })
   return await request.put({ url: `/trade/order/update-remark`, data })
 }
 }
 
 
 // 订单调价
 // 订单调价
-export const updatePrice = async (data: any) => {
+export const updateOrderPrice = async (data: any) => {
   return await request.put({ url: `/trade/order/update-price`, data })
   return await request.put({ url: `/trade/order/update-price`, data })
 }
 }
 
 
 // 修改订单地址
 // 修改订单地址
-export const updateAddress = async (data: any) => {
+export const updateOrderAddress = async (data: any) => {
   return await request.put({ url: `/trade/order/update-address`, data })
   return await request.put({ url: `/trade/order/update-address`, data })
 }
 }

src/utils/constants.ts

@@ -375,3 +375,17 @@ export const BrokerageWithdrawTypeEnum = {
     name: '支付宝'
     name: '支付宝'
   }
   }
 }
 }
+
+/**
+ * 配送方式枚举
+ */
+export const DeliveryTypeEnum = {
+  EXPRESS: {
+    type: 1,
+    name: '快递发货'
+  },
+  PICK_UP: {
+    type: 2,
+    name: '到店自提'
+  }
+}

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

@@ -54,7 +54,7 @@ const open = async (row: TradeOrderApi.OrderVO) => {
   resetForm()
   resetForm()
   // 设置数据
   // 设置数据
   copyValueToTarget(formData.value, row)
   copyValueToTarget(formData.value, row)
-  if (row.logisticsId === null || row.logisticsId === 0) {
+  if (row.logisticsId === 0) {
     expressType.value = 'none'
     expressType.value = 'none'
   }
   }
   dialogVisible.value = true
   dialogVisible.value = true
@@ -73,7 +73,7 @@ const submitForm = async () => {
       data.logisticsId = 0
       data.logisticsId = 0
       data.logisticsNo = ''
       data.logisticsNo = ''
     }
     }
-    await TradeOrderApi.delivery(data)
+    await TradeOrderApi.deliveryOrder(data)
     message.success(t('common.updateSuccess'))
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
     dialogVisible.value = false
     // 发送操作成功的事件
     // 发送操作成功的事件

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

@@ -69,7 +69,7 @@ const submitForm = async () => {
   formLoading.value = true
   formLoading.value = true
   try {
   try {
     const data = unref(formData)
     const data = unref(formData)
-    await TradeOrderApi.updateAddress(data)
+    await TradeOrderApi.updateOrderAddress(data)
     message.success(t('common.updateSuccess'))
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
     dialogVisible.value = false
     // 发送操作成功的事件
     // 发送操作成功的事件

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

@@ -69,7 +69,7 @@ const submitForm = async () => {
     data.adjustPrice = convertToInteger(data.adjustPrice)
     data.adjustPrice = convertToInteger(data.adjustPrice)
     delete data.payPrice
     delete data.payPrice
     delete data.newPayPrice
     delete data.newPayPrice
-    await TradeOrderApi.updatePrice(data)
+    await TradeOrderApi.updateOrderPrice(data)
     message.success(t('common.updateSuccess'))
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
     dialogVisible.value = false
     // 发送操作成功的事件
     // 发送操作成功的事件

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

@@ -49,7 +49,7 @@ const submitForm = async () => {
   formLoading.value = true
   formLoading.value = true
   try {
   try {
     const data = unref(formData)
     const data = unref(formData)
-    await TradeOrderApi.updateRemark(data)
+    await TradeOrderApi.updateOrderRemark(data)
     message.success(t('common.updateSuccess'))
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
     dialogVisible.value = false
     // 发送操作成功的事件
     // 发送操作成功的事件