From 33a6a3deb07a08d200bec32eeee9b12504c5008b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 10:01:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..fe3df53 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.*;
@@ -17,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
@@ -55,6 +57,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,8 +75,6 @@
@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());
@@ -87,8 +91,8 @@
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