From b5bec73f81de6bdfb30c69a7259b11f945802015 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 17:27:44 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 2131ace..5da3b88 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -5,6 +5,7 @@
import com.jilongda.common.basic.PageInfo;
import com.jilongda.common.constants.WarehousingConstant;
import com.jilongda.common.utils.CodeGenerateUtils;
+import com.jilongda.common.utils.TimeUtils;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.authority.service.SecUserService;
import com.jilongda.manage.model.*;
@@ -16,7 +17,9 @@
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.*;
import java.text.SimpleDateFormat;
@@ -55,6 +58,10 @@
@ApiOperation(value = "订单售后列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderAftersalesVO>> pageList(@RequestBody TOrderAftersalesQuery query) {
+ if (StringUtils.hasLength(query.getStartTime())){
+ query.setStartTime(query.getStartTime()+" 00:00:00");
+ query.setEndTime(query.getEndTime()+" 23:59:59");
+ }
PageInfo<TOrderAftersalesVO> orderAftersalesVOPageInfo = orderAftersalesService.pageList(query);
return ApiResult.success(orderAftersalesVOPageInfo);
}
@@ -69,26 +76,30 @@
@ApiOperation(value = "订单售后详情")
@GetMapping(value = "/detail")
public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
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());
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());
res.setSalesUser(byId3.getNickName());
- res.setOrderTime(simpleDateFormat.format(byId1.getCreateTime()));
- res.setAfterSalesTime(simpleDateFormat1.format(byId.getCreateTime()));
+ res.setOrderTime(TimeUtils.localDateTimeToString(byId1.getCreateTime()));
+ res.setAfterSalesTime(TimeUtils.localDateTimeToString(byId.getCreateTime()));
List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
res.setGoodsList(list);
res.setOrderMoney(byId1.getOrderMoney());
--
Gitblit v1.7.1