From f445dcb2f7dab0411c1797e9f5b12aeaf694c5e5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 13:34:04 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 0d8e1f2..b3a3f3d 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -21,7 +21,9 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
@@ -57,6 +59,7 @@
private LoginInfoUtil loginInfoUtil;
@Autowired
private TOptometryService optometryService;
+
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -86,10 +89,16 @@
res.setRealName(byId.getRealName());
res.setGender(byId.getGender());
}
+ List<TOrderItems> list1 = orderItemsService.lambdaQuery().eq(TOrderItems::getOrderId, id).list();
+ for (TOrderItems orderItems : list1) {
+ SecFeeItems secFeeItems = feeItemsService.getById(orderItems.getItemsId());
+ orderItems.setItemsName(secFeeItems.getName());
+ }
+ res.setItemsId(byId.getItemsId());
res.setUserId(byId.getUserId());
res.setOptometryId(byId.getOptometryId());
List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
- .eq(TOptometryDetail::getType, 1).list();
+ .eq(TOptometryDetail::getType, 1).list();
res.setOptometryDetails(list);
List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
.eq(TOrderGoods::getOrderId, id).list();
@@ -118,7 +127,7 @@
@Autowired
private TOrderItemsService orderItemsService;
@ApiOperation(value = "确认核算操作")
- @GetMapping(value = "/confirm")
+ @PostMapping(value = "/confirm")
public ApiResult confirm(@RequestBody AccountDetailDTO dto) {
List<TOrderGoods> list = dto.getList();
orderGoodsService.updateBatchById(list);
--
Gitblit v1.7.1