1

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -1,41 +1,47 @@
-package com.fs.live.controller.controller;
+package com.fs.live.controller;
 
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.service.ILiveOrderService;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.live.domain.LiveGoodsOrder;
-import com.fs.live.service.ILiveGoodsOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 订单Controller
- *
+ * 
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
 @RestController
 @RequestMapping("/live/liveOrder")
-public class LiveGoodsOrderController extends BaseController
+public class LiveOrderController extends BaseController
 {
     @Autowired
-    private ILiveGoodsOrderService liveGoodsOrderService;
+    private ILiveOrderService liveOrderService;
 
     /**
      * 查询订单列表
      */
     @PreAuthorize("@ss.hasPermi('live:liveOrder:list')")
     @GetMapping("/list")
-    public TableDataInfo list(LiveGoodsOrder liveGoodsOrder)
+    public TableDataInfo list(LiveOrder liveOrder)
     {
         startPage();
-        List<LiveGoodsOrder> list = liveGoodsOrderService.selectLiveGoodsOrderList(liveGoodsOrder);
+        List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
         return getDataTable(list);
     }
 
@@ -45,10 +51,10 @@ public class LiveGoodsOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveOrder:export')")
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(LiveGoodsOrder liveGoodsOrder)
+    public AjaxResult export(LiveOrder liveOrder)
     {
-        List<LiveGoodsOrder> list = liveGoodsOrderService.selectLiveGoodsOrderList(liveGoodsOrder);
-        ExcelUtil<LiveGoodsOrder> util = new ExcelUtil<LiveGoodsOrder>(LiveGoodsOrder.class);
+        List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
+        ExcelUtil<LiveOrder> util = new ExcelUtil<LiveOrder>(LiveOrder.class);
         return util.exportExcel(list, "订单数据");
     }
 
@@ -57,9 +63,9 @@ public class LiveGoodsOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
     @GetMapping(value = "/{orderId}")
-    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
+    public AjaxResult getInfo(@PathVariable("orderId") String orderId)
     {
-        return AjaxResult.success(liveGoodsOrderService.selectLiveGoodsOrderByOrderId(orderId));
+        return AjaxResult.success(liveOrderService.selectLiveOrderByOrderId(orderId));
     }
 
     /**
@@ -68,9 +74,9 @@ public class LiveGoodsOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveOrder:add')")
     @Log(title = "订单", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody LiveGoodsOrder liveGoodsOrder)
+    public AjaxResult add(@RequestBody LiveOrder liveOrder)
     {
-        return toAjax(liveGoodsOrderService.insertLiveGoodsOrder(liveGoodsOrder));
+        return toAjax(liveOrderService.insertLiveOrder(liveOrder));
     }
 
     /**
@@ -79,9 +85,9 @@ public class LiveGoodsOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveOrder:edit')")
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody LiveGoodsOrder liveGoodsOrder)
+    public AjaxResult edit(@RequestBody LiveOrder liveOrder)
     {
-        return toAjax(liveGoodsOrderService.updateLiveGoodsOrder(liveGoodsOrder));
+        return toAjax(liveOrderService.updateLiveOrder(liveOrder));
     }
 
     /**
@@ -90,8 +96,8 @@ public class LiveGoodsOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveOrder:remove')")
     @Log(title = "订单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
+    public AjaxResult remove(@PathVariable String[] orderIds)
     {
-        return toAjax(liveGoodsOrderService.deleteLiveGoodsOrderByOrderIds(orderIds));
+        return toAjax(liveOrderService.deleteLiveOrderByOrderIds(orderIds));
     }
 }