From 5c488718c8b3656ba76d534ee5b797e683bfa2f3 Mon Sep 17 00:00:00 2001 From: riverflow <3011499946@qq.com> Date: Thu, 21 Aug 2025 21:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8F=91=E8=B4=A7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/UserOrderController.java | 15 ++ .../com/itmk/web/order/entity/SendParm.java | 9 + order-system/src/api/order/index.ts | 9 +- .../src/compositions/order/useOrderTable.ts | 128 ++++++----- order-system/src/views/order/Index.vue | 201 +++++++++--------- 5 files changed, 203 insertions(+), 159 deletions(-) create mode 100644 api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/entity/SendParm.java diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java index 33a8482..d3fe25e 100644 --- a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java +++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java @@ -1,9 +1,11 @@ package com.itmk.web.order.controller; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.itmk.utils.ResultUtils; import com.itmk.utils.ResultVo; import com.itmk.web.order.entity.OrderParm; +import com.itmk.web.order.entity.SendParm; import com.itmk.web.order.entity.UserOrder; import com.itmk.web.order.entity.WxOrderParm; import com.itmk.web.order.service.UserOrderService; @@ -36,4 +38,17 @@ public class UserOrderController { IPage orderList = userOrderService.getPcOrderList(parm); return ResultUtils.success("查询成功!",orderList); } + + //发货 + @PutMapping("/sendOrder") + public ResultVo sendOrder(@RequestBody SendParm parm){ + //更新条件 + LambdaUpdateWrapper query = new LambdaUpdateWrapper<>(); + query.eq(UserOrder::getOrderId,parm.getOrderId()) + .set(UserOrder::getStatus,"1"); + if(userOrderService.update(query)){ + return ResultUtils.success("更新成功!"); + } + return ResultUtils.error("更新失败!"); + } } diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/entity/SendParm.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/entity/SendParm.java new file mode 100644 index 0000000..666f134 --- /dev/null +++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/entity/SendParm.java @@ -0,0 +1,9 @@ +package com.itmk.web.order.entity; + + +import lombok.Data; + +@Data +public class SendParm { + private Long orderId; +} diff --git a/order-system/src/api/order/index.ts b/order-system/src/api/order/index.ts index 65994e9..af78a78 100644 --- a/order-system/src/api/order/index.ts +++ b/order-system/src/api/order/index.ts @@ -1,6 +1,11 @@ import http from "../../http"; import type { OrderListParm } from "./OrderModel"; //列表 -export const gePcOrdertListApi = (parm:OrderListParm)=>{ - return http.get("/wxapi/order/getPcOrderList",parm) +export const gePcOrdertListApi = (parm: OrderListParm) => { + return http.get("/wxapi/order/getPcOrderList", parm) +} + +// 发货 +export const sendOrderApi = (orderId: string) => { + return http.put("/wxapi/order/sendOrder", { orderId: orderId }) } \ No newline at end of file diff --git a/order-system/src/compositions/order/useOrderTable.ts b/order-system/src/compositions/order/useOrderTable.ts index 44f1ff9..f2558bd 100644 --- a/order-system/src/compositions/order/useOrderTable.ts +++ b/order-system/src/compositions/order/useOrderTable.ts @@ -1,63 +1,77 @@ import type { OrderListParm } from '../../api/order/OrderModel' -import {nextTick, onMounted, reactive, ref} from 'vue' -import { gePcOrdertListApi } from '../../api/order' -export default function useOrderTable(){ - //表格高度 - const tableHeight = ref(0) - //表格数据 - const tableList = ref([]) - //表格查询的参数 - const listParm = reactive({ - currentPage:1, - pageSize:10, - type:'', - userName:'', - total:0 - }) - //列表 - const getList = async()=>{ - let res = await gePcOrdertListApi(listParm) - if(res && res.code == 200){ - //设置表格数据 - tableList.value = res.data.records; - //设置分页总条数 - listParm.total = res.data.total; - } - } - //搜索 - const searchBtn = ()=>{ - getList() - } - //重置 - const resetBtn = ()=>{ - listParm.currentPage = 1; - listParm.type = '' - getList() +import { nextTick, onMounted, reactive, ref } from 'vue' +import { gePcOrdertListApi, sendOrderApi } from '../../api/order' +import useInstance from '@/hooks/useInstance' +export default function useOrderTable() { + const { global } = useInstance() + //表格高度 + const tableHeight = ref(0) + //表格数据 + const tableList = ref([]) + //表格查询的参数 + const listParm = reactive({ + currentPage: 1, + pageSize: 10, + type: '', + userName: '', + total: 0 + }) + //列表 + const getList = async () => { + let res = await gePcOrdertListApi(listParm) + if (res && res.code == 200) { + //设置表格数据 + tableList.value = res.data.records; + //设置分页总条数 + listParm.total = res.data.total; } - //页容量改变触发 - const sizeChange = (size:number)=>{ - listParm.pageSize = size; + } + //搜索 + const searchBtn = () => { + getList() + } + //重置 + const resetBtn = () => { + listParm.currentPage = 1; + listParm.type = '' + getList() + } + //页容量改变触发 + const sizeChange = (size: number) => { + listParm.pageSize = size; + getList() + } + //页数改变触发 + const currentChange = (page: number) => { + listParm.currentPage = page; + getList() + } + // 发货 + const sendOrder = async (orderId: string) => { + let confirm = await global.$myconfirm('确定发货吗?') + if (confirm) { + let res = await sendOrderApi(orderId) + if (res && res.code == 200) { getList() + } } - //页数改变触发 - const currentChange = (page:number)=>{ - listParm.currentPage = page; - getList() - } - onMounted(()=>{ - getList() - nextTick(()=>{ - tableHeight.value = window.innerHeight - 220 - }) + } + + onMounted(() => { + getList() + nextTick(() => { + tableHeight.value = window.innerHeight - 220 }) - return{ - tableList, - listParm, - getList, - searchBtn, - resetBtn, - sizeChange, - currentChange, - tableHeight - } + }) + return { + tableList, + sendOrder, + listParm, + getList, + searchBtn, + resetBtn, + sizeChange, + currentChange, + tableHeight + } } \ No newline at end of file diff --git a/order-system/src/views/order/Index.vue b/order-system/src/views/order/Index.vue index 37440e5..bc74091 100644 --- a/order-system/src/views/order/Index.vue +++ b/order-system/src/views/order/Index.vue @@ -1,102 +1,103 @@ - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file