From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 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 d169bb7..fe8dd7b 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -81,35 +81,39 @@
@ApiOperation(value = "订单售后详情")
@GetMapping(value = "/detail")
public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
- TOrderAftersales byId = orderAftersalesService.getById(id);
- TOrder byId1 = orderService.getById(byId.getOrderId());
- TStore byId2 = tStoreService.getById(byId1.getStoreId());
- SecUser byId3 = secUserService.getById(byId.getSysId());
- TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
+ TOrderAftersales orderAftersales = orderAftersalesService.getById(id);
+ TOrder order = orderService.getById(orderAftersales.getOrderId());
+ TStore store = tStoreService.getById(order.getStoreId());
+ SecUser sysUser = secUserService.getById(orderAftersales.getSysId());
+ TOptometrist optometrist = tOptometristService.getById(orderAftersales.getOptometristId());
TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
- BeanUtils.copyProperties(byId,res);
- res.setOrderId(byId1.getId());
- if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1.getUserId());
+ BeanUtils.copyProperties(orderAftersales,res);
+ res.setOrderId(order.getId());
+ if (order.getUserId()!=null){
+ TAppUser byId4 = appUserService.getById(order.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.setPhone(order.getPhone());
+ res.setRealName(order.getRealName());
}
- res.setStoreName(byId2.getName());
- res.setOptometristName(byId5.getName());
- res.setSalesUser(byId3.getNickName());
- res.setOrderTime(TimeUtils.localDateTimeToString(byId1.getCreateTime()));
- res.setAfterSalesTime(TimeUtils.localDateTimeToString(byId.getCreateTime()));
- List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
+ res.setStoreName(store.getName());
+ if (optometrist!=null){
+ res.setOptometristName(optometrist.getName());
+ }
+ if (sysUser!=null){
+ res.setSalesUser(sysUser.getNickName());
+ }
+ res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
+ res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
+ List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();
res.setGoodsList(list);
- res.setOrderMoney(byId1.getOrderMoney());
- res.setCouponMoney(byId1.getCouponMoney());
- res.setPayMoney(byId1.getPayMoney());
+ res.setOrderMoney(order.getOrderMoney());
+ res.setCouponMoney(order.getCouponMoney());
+ res.setPayMoney(order.getPayMoney());
return ApiResult.success(res);
}
--
Gitblit v1.7.1