From 8d0c63d2f96cc31dd45581ac21b8c900c200e134 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 十二月 2024 16:44:35 +0800
Subject: [PATCH] 验光师
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 15 +++------------
1 files changed, 3 insertions(+), 12 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 12cfa49..07d8138 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -59,7 +59,6 @@
public ApiResult<TOrderAccountVO> detail(Integer id) {
TOrderAccountVO res = new TOrderAccountVO();
TOrder byId = orderService.getById(id);
- TOrderAccounting one = orderAccountingService.lambdaQuery().eq(TOrderAccounting::getOrderId, id).one();
if (byId.getUserId()!=null){
TAppUser byId1 = appUserService.getById(byId.getUserId());
if(byId1!=null){
@@ -78,9 +77,6 @@
BigDecimal goodsMoney = new BigDecimal("0");
BigDecimal costMoney = new BigDecimal("0");
BigDecimal constConfirm = new BigDecimal("0");
- if (one!=null){
-
- }
for (TOrderGoods orderGood : orderGoods) {
goodsMoney =goodsMoney.add(orderGood.getGoodsMoney());
costMoney=costMoney.add(orderGood.getCost()==null?new BigDecimal("0"):orderGood.getCost());
@@ -106,14 +102,9 @@
return ApiResult.success(res);
}
@ApiOperation(value = "确认核算操作")
- @PostMapping(value = "/confirm")
- public ApiResult confirm(@RequestBody TOrderAccountingQuery query) {
- if (StringUtils.hasLength(query.getStartTime())){
- query.setStartTime(query.getStartTime()+" 00:00:00");
- query.setEndTime(query.getEndTime()+" 23:59:59");
- }
- PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
- return ApiResult.success(res);
+ @GetMapping(value = "/confirm")
+ public ApiResult confirm() {
+ return ApiResult.success();
}
}
--
Gitblit v1.7.1