From 91991096ba5c8fb27399b317715c76b2c43a15f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 15:35:06 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 91c8315..bd53699 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -53,6 +53,8 @@
private SecFeeItemsService feeItemsService;
@Autowired
private LoginInfoUtil loginInfoUtil;
+ @Autowired
+ private TOptometryService optometryService;
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -73,12 +75,17 @@
if(byId1!=null){
res.setName(byId1.getName());
res.setPhone(byId1.getPhone());
+ res.setRealName(byId1.getRealName());
+ res.setGender(byId1.getGender());
}
+ }else {
+ res.setPhone(byId.getPhone());
+ res.setAge(byId.getAge());
+ res.setRealName(byId.getRealName());
+ res.setGender(byId.getGender());
}
- res.setPhone(byId.getPhone());
- res.setAge(byId.getAge());
- res.setRealName(byId.getRealName());
- res.setGender(byId.getGender());
+ res.setUserId(byId.getUserId());
+ res.setOptometryId(byId.getOptometryId());
List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
.eq(TOptometryDetail::getType, 1).list();
res.setOptometryDetails(list);
--
Gitblit v1.7.1