From 525c120c93c2c25d8dfc59d4fac234b80b37d1c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 09:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
index b7402f2..44a7c23 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -1,6 +1,20 @@
 package com.jilongda.manage.controller;
 
 
+import com.jilongda.common.basic.ApiResult;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.model.TLineUp;
+import com.jilongda.manage.query.TLineUpQuery;
+import com.jilongda.manage.query.TOrderAccountingQuery;
+import com.jilongda.manage.service.TOrderAccountingService;
+import com.jilongda.manage.service.TOrderService;
+import com.jilongda.manage.service.TStoreService;
+import com.jilongda.manage.vo.TOrderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +28,20 @@
  * @since 2024-12-09
  */
 @RestController
+@Api(tags = "订单核算")
 @RequestMapping("/t-order-accounting")
 public class TOrderAccountingController {
-
+    @Autowired
+    private TStoreService storeService;
+    @Autowired
+    private TOrderService orderService;
+    @Autowired
+    private TOrderAccountingService orderAccountingService;
+    @ApiOperation(value = "核算订单分页列表")
+    @PostMapping(value = "/pageList")
+    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
+        PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
+        return ApiResult.success(res);
+    }
 }
 

--
Gitblit v1.7.1