From 1520ca6935e244a06e12675ada88e04c989c35b9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 10:02:48 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 e36ffb0..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;
@@ -36,6 +37,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -67,6 +69,7 @@
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TOrderSaleVO>> pageList(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
+ query.setIsCover(1);
return AjaxResult.success(orderSaleService.pageList(query));
}
@@ -75,7 +78,7 @@
*/
@ApiOperation( value = "查询销售金额统计")
@PostMapping(value = "/amountSum")
- public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderMealQuery query) {
+ public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
return AjaxResult.success(orderSaleService.amountSum(query));
}
@@ -84,14 +87,26 @@
@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)
.eq(TOrderSaleGoods::getOrderId, orderSale.getId()));
orderSaleVO.setOrderSaleGoods(list);
+ BigDecimal sum = BigDecimal.ZERO;
+ Integer count = 0;
+ for (TOrderSaleGoods tOrderSaleGoods : list) {
+ sum = sum.add(tOrderSaleGoods.getThisSalePrice().multiply(new BigDecimal(tOrderSaleGoods.getGoodsCount())));
+ count = count + tOrderSaleGoods.getGoodsCount();
+ }
+ orderSaleVO.setGoodsAmount(sum);
+ orderSaleVO.setGoodsCount(count);
return AjaxResult.success(orderSaleVO);
}
+ @Log(title = "销售订单-删除销售订单", businessType = BusinessType.DELETE)
@ApiOperation( value = "删除销售订单")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) {
@@ -103,6 +118,7 @@
/**
* 销售下单接口
*/
+ @Log(title = "销售-销售下单", businessType = BusinessType.INSERT)
@ApiOperation( value = "销售下单接口")
@PostMapping(value = "/add")
public AjaxResult<String> add(@RequestBody TOrderSaleDTO dto) {
@@ -111,6 +127,18 @@
return AjaxResult.success();
}
+ /**
+ * 销售下单接口
+ */
+ @Log(title = "销售-销售修改", businessType = BusinessType.UPDATE)
+ @ApiOperation( value = "销售单修改接口")
+ @PostMapping(value = "/edit")
+ public AjaxResult<String> edit(@RequestBody TOrderSaleDTO dto) {
+ orderSaleService.edit(dto);
+ return AjaxResult.success();
+ }
+
+ @Log(title = "销售-结账", businessType = BusinessType.UPDATE)
@ApiOperation( value = "结账接口")
@PostMapping(value = "/checkout")
public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) {
@@ -121,20 +149,23 @@
/**
* 导出销售列表
*/
+ @Log(title = "销售-导出销售列表", businessType = BusinessType.UPDATE)
@ApiOperation(value = "导出销售列表")
@PostMapping("/exportOrderSale")
public void exportOrderSale(@RequestBody TOrderMealQuery query)
{
+ query.setShopId(tokenService.getLoginUser().getObjectId());
List<TOrderSaleVO> list = orderSaleService.exportOrderSale(query);
- List<TOrderMealExportExcel> orderMeals = new ArrayList<>();
+ List<TOrderSaleExportExcel> orderMeals = new ArrayList<>();
for (TOrderSaleVO orderSaleVO : list) {
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(), TOrderMealExportExcel.class, orderMeals);
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderSaleExportExcel.class, orderMeals);
HttpServletResponse response = WebUtils.response();
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
--
Gitblit v1.7.1