From 4667d1e9ac2b01a6753eb8a87fb721051bf07ac4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/java/com/jilongda/applet/controller/TOrderController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TOrderController.java b/applet/src/main/java/com/jilongda/applet/controller/TOrderController.java
index ac303d8..b561d80 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TOrderController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TOrderController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.applet.model.TOptometryDetail;
import com.jilongda.applet.model.TOrder;
+import com.jilongda.applet.model.TOrderGoods;
import com.jilongda.applet.model.TStore;
import com.jilongda.applet.query.TOrderQuery;
import com.jilongda.applet.service.*;
@@ -50,6 +51,8 @@
return ApiResult.success(pageInfo);
}
+ @Autowired
+ private TOrderGoodsService tOrderGoodsService;
@ApiOperation(value = "查询订单详情")
@GetMapping(value = "/getDetailById")
public ApiResult getDetailById(@RequestParam Integer id) {
@@ -61,6 +64,9 @@
if(Objects.nonNull(store)){
tOrderVO.setStoreName(store.getName());
}
+ // 查询商品详情
+ List<TOrderGoods> list1 = tOrderGoodsService.lambdaQuery().eq(TOrderGoods::getOrderId, id).list();
+ tOrderVO.setGoodsList(list1);
// 查询配镜处方
List<TOptometryDetail> list = optometryDetailService.list(Wrappers.lambdaQuery(TOptometryDetail.class)
.eq(TOptometryDetail::getOptometryId, order.getOptometryId()));
--
Gitblit v1.7.1