From 87f0dfb91e489ca09d73e87379b8f7f90aa5ea6e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 09 一月 2025 14:56:42 +0800
Subject: [PATCH] 修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 5f74fba..e1d0aaa 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.authority.model.SecUser;
@@ -21,7 +22,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 +60,7 @@
private LoginInfoUtil loginInfoUtil;
@Autowired
private TOptometryService optometryService;
+
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -91,10 +95,11 @@
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,17 +123,20 @@
res.setPayType(one1.getName());
res.setProfitMoney(byId.getProfitMoney());
res.setProfitRating(byId.getProfitRating());
+ List<TOrderItems> orderItems = orderItemsService.list(Wrappers.lambdaQuery(TOrderItems.class)
+ .eq(TOrderItems::getOrderId, id));
+ res.setOrderItems(orderItems);
return ApiResult.success(res);
}
@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);
TOrder byId = orderService.getById(dto.getId());
- byId.setConfirmPayType(dto.getPayTypeName());
+ byId.setPayTypeName(dto.getPayTypeName());
byId.setPayMoney(dto.getPayMoney());
byId.setCommissionMoney(dto.getCommission());
byId.setIsAccounting(1);
--
Gitblit v1.7.1