From 2c130857cc3323376e3c19bb1c855bc7a6086150 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 十二月 2024 09:43:31 +0800
Subject: [PATCH] 123
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 44a7c23..5e5e1ac 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -13,11 +13,8 @@
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;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -40,6 +37,26 @@
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
+ if (StringUtils.hasLength(query.getStartTime())){
+ query.setStartTime(query.getStartTime()+" 00:00:00");
+ query.setEndTime(query.getEndTime()+" 23:59:59");
+ }
+ PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
+ return ApiResult.success(res);
+ }
+ @ApiOperation(value = "核算详情页面")
+ @GetMapping(value = "/detail")
+ public ApiResult detail(Integer id) {
+
+ return ApiResult.success();
+ }
+ @ApiOperation(value = "确认核算操作")
+ @PostMapping(value = "/confirm")
+ public ApiResult confirm(@RequestBody TOrderAccountingQuery query) {
+ if (StringUtils.hasLength(query.getStartTime())){
+ query.setStartTime(query.getStartTime()+" 00:00:00");
+ query.setEndTime(query.getEndTime()+" 23:59:59");
+ }
PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
return ApiResult.success(res);
}
--
Gitblit v1.7.1