From 175b87906745d1592825b87a158ae8627c28343a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 十二月 2024 14:59:12 +0800
Subject: [PATCH] 核算订单
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 cebff63..94ff402 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -15,6 +15,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -39,6 +40,8 @@
private TAppUserService appUserService;
@Autowired
private TOptometryDetailService optometryDetailService;
+ @Autowired
+ private TOrderGoodsService orderGoodsService;
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -68,11 +71,18 @@
List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
.eq(TOptometryDetail::getType, 1).list();
res.setOptometryDetails(list);
-// res.setOrderGoods();
-// res.setStoreName();
-// res.setOrderMoney();
-// res.setCouponMoney();
-// res.setPayMoney();
+ List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
+ .eq(TOrderGoods::getOrderId, id).list();
+ BigDecimal bigDecimal = new BigDecimal("0");
+ for (TOrderGoods orderGood : orderGoods) {
+ bigDecimal =bigDecimal.add(orderGood.getGoodsMoney());
+ }
+ res.setOrderGoods(orderGoods);
+ TStore byId1 = storeService.getById(byId.getStoreId());
+ res.setStoreName(byId1.getName());
+ res.setOrderMoney(bigDecimal);
+ res.setCouponMoney(byId.getCouponMoney());
+ res.setPayMoney(byId.getPayMoney());
// res.setPayType();
// res.setRealPayMoney();
// res.setCommission();
--
Gitblit v1.7.1