From 898a452132dcdb337d9fbf1e0e67872d05034559 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 23 九月 2025 11:10:19 +0800
Subject: [PATCH] 操作日志
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a28ab1e..f7a3edc 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
@@ -4,8 +4,10 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -13,7 +15,6 @@
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;
import com.ruoyi.system.query.TOrderMealQuery;
import com.ruoyi.system.query.TOrderSaleQuery;
@@ -105,6 +106,7 @@
return AjaxResult.success(orderSaleVO);
}
+ @Log(title = "销售订单-删除销售订单", businessType = BusinessType.DELETE)
@ApiOperation( value = "删除销售订单")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) {
@@ -116,6 +118,7 @@
/**
* 销售下单接口
*/
+ @Log(title = "销售-销售下单", businessType = BusinessType.INSERT)
@ApiOperation( value = "销售下单接口")
@PostMapping(value = "/add")
public AjaxResult<String> add(@RequestBody TOrderSaleDTO dto) {
@@ -127,6 +130,7 @@
/**
* 销售下单接口
*/
+ @Log(title = "销售-销售修改", businessType = BusinessType.UPDATE)
@ApiOperation( value = "销售单修改接口")
@PostMapping(value = "/edit")
public AjaxResult<String> edit(@RequestBody TOrderSaleDTO dto) {
@@ -134,6 +138,7 @@
return AjaxResult.success();
}
+ @Log(title = "销售-结账", businessType = BusinessType.UPDATE)
@ApiOperation( value = "结账接口")
@PostMapping(value = "/checkout")
public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) {
@@ -144,6 +149,7 @@
/**
* 导出销售列表
*/
+ @Log(title = "销售-导出销售列表", businessType = BusinessType.UPDATE)
@ApiOperation(value = "导出销售列表")
@PostMapping("/exportOrderSale")
public void exportOrderSale(@RequestBody TOrderMealQuery query)
@@ -155,8 +161,8 @@
TOrderSaleExportExcel orderSaleExportExcel = new TOrderSaleExportExcel();
BeanUtils.copyProperties(orderSaleVO, orderSaleExportExcel);
orderSaleExportExcel.setCreateStrTime(DateUtils.localDateTimeToString(orderSaleVO.getCreateTime()));
- orderSaleExportExcel.setGoodsAmount(orderSaleVO.getOrderSaleGoods().stream().map(TOrderSaleGoods::getThisSalePrice).reduce(BigDecimal::add).get());
- orderSaleExportExcel.setGoodsCount(orderSaleVO.getOrderSaleGoods().size());
+ orderSaleExportExcel.setGoodsAmount(orderSaleVO.getGoodsAmount());
+ orderSaleExportExcel.setGoodsCount(orderSaleVO.getGoodsCount());
orderMeals.add(orderSaleExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderSaleExportExcel.class, orderMeals);
--
Gitblit v1.7.1