From a0270d2d70497ce4a0ddcf1e7d27eb822b6694c6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 17:06:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index fe3df53..5da3b88 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -17,6 +17,7 @@
import com.jilongda.manage.vo.TOrderAftersalesVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -81,12 +82,18 @@
SecUser byId3 = secUserService.getById(byId.getSysId());
TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
+ BeanUtils.copyProperties(byId,res);
res.setOrderId(byId1.getId());
if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1);
+ TAppUser byId4 = appUserService.getById(byId1.getUserId());
if (byId4!=null){
res.setPhone(byId4.getPhone());
+ res.setName(byId4.getName());
+ res.setRealName(byId4.getRealName());
}
+ }else{
+ res.setPhone(byId1.getPhone());
+ res.setRealName(byId1.getRealName());
}
res.setStoreName(byId2.getName());
res.setOptometristName(byId5.getName());
--
Gitblit v1.7.1