Merge pull request '完成发货接口的开发' (#61) from Brunch_LPQ into main

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<UserOrder> orderList = userOrderService.getPcOrderList(parm);
         return ResultUtils.success("查询成功!",orderList);
     }
+
+    //发货
+    @PutMapping("/sendOrder")
+    public ResultVo sendOrder(@RequestBody SendParm parm){
+        //更新条件
+        LambdaUpdateWrapper<UserOrder> query = new LambdaUpdateWrapper<>();
+        query.eq(UserOrder::getOrderId,parm.getOrderId())
+                .set(UserOrder::getStatus,"1");
+        if(userOrderService.update(query)){
+            return ResultUtils.success("更新成功!");
+        }
+        return ResultUtils.error("更新失败!");
+    }
 }

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;
+}

order-system/src/api/order/index.ts

@@ -4,3 +4,8 @@ import type { OrderListParm } from "./OrderModel";
 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 })
+}

order-system/src/compositions/order/useOrderTable.ts

@@ -1,7 +1,9 @@
 import type { OrderListParm } from '../../api/order/OrderModel'
 import { nextTick, onMounted, reactive, ref } from 'vue'
-import { gePcOrdertListApi } from '../../api/order'
+import { gePcOrdertListApi, sendOrderApi } from '../../api/order'
+import useInstance from '@/hooks/useInstance'
 export default function useOrderTable() {
+  const { global } = useInstance()
   //表格高度
   const tableHeight = ref(0)
   //表格数据
@@ -44,6 +46,17 @@ export default function useOrderTable(){
     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()
+      }
+    }
+  }
+
   onMounted(() => {
     getList()
     nextTick(() => {
@@ -52,6 +65,7 @@ export default function useOrderTable(){
   })
   return {
     tableList,
+    sendOrder,
     listParm,
     getList,
     searchBtn,

order-system/src/views/order/Index.vue

@@ -64,7 +64,7 @@
         </el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
-          <el-button type="primary" :icon="Edit" size="default">发货</el-button>
+            <el-button type="primary" @click="sendOrder(scope.row.orderId)" :icon="Edit" size="default">发货</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -89,7 +89,7 @@ import useOrderTable from "../../compositions/order/useOrderTable";
   //表格业务
   const {
     tableList,
-  getList,
+    sendOrder,
     listParm,
     resetBtn,
     searchBtn,
@@ -100,3 +100,4 @@ const {
   </script>
   
   <style scoped></style>
+