From 9ca97fd558700e7054c5f54192a9db7a1e6b8230 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 16:31:47 +0800
Subject: [PATCH] 完善导出等接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
index 6a885af..bb611bb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TOrderSale;
import com.ruoyi.system.domain.TOrderSaleGoods;
+import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.export.TOrderMealExportExcel;
import com.ruoyi.system.export.TOrderSaleExportExcel;
@@ -25,6 +26,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
@@ -34,6 +36,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -82,6 +85,9 @@
@GetMapping(value = "/getDetailById")
public AjaxResult<TOrderSaleVO> getDetailById(@RequestParam(value = "id") Long id) {
TOrderSale orderSale = orderSaleService.getById(id);
+ if(Objects.isNull(orderSale)){
+ return AjaxResult.error("未查询到销售单");
+ }
TOrderSaleVO orderSaleVO = new TOrderSaleVO();
BeanUtils.copyProperties(orderSale, orderSaleVO);
List<TOrderSaleGoods> list = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
@@ -110,6 +116,23 @@
}
/**
+ * 销售下单接口
+ */
+ @ApiOperation( value = "销售单修改接口")
+ @PostMapping(value = "/edit")
+ public AjaxResult<String> edit(@RequestBody TOrderSaleDTO dto) {
+ orderSaleService.edit(dto);
+ return AjaxResult.success();
+ }
+
+ @ApiOperation( value = "结账接口")
+ @PostMapping(value = "/checkout")
+ public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) {
+ orderSaleService.checkout(dto);
+ return AjaxResult.success();
+ }
+
+ /**
* 导出销售列表
*/
@ApiOperation(value = "导出销售列表")
--
Gitblit v1.7.1