From 2885941cf88da7397f2e641e383a26337f3c2b03 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 20:55:51 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
index 486366f..c112f4f 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
@@ -3,10 +3,12 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.goods.api.domain.TGoods;
import com.ruoyi.goods.api.domain.TOrder;
import com.ruoyi.management.domain.TUser;
import com.ruoyi.management.dto.OrderDTO;
import com.ruoyi.management.dto.OrderQuery;
+import com.ruoyi.management.service.ITGoodsService;
import com.ruoyi.management.service.ITOrderService;
import com.ruoyi.management.service.ITUserService;
import com.ruoyi.management.vo.TOrderVO;
@@ -18,6 +20,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -36,14 +40,19 @@
private ITOrderService tOrderService;
@Autowired
private ITUserService userService;
+ @Autowired
+ private ITGoodsService goodsService;
@ResponseBody
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"后台-订单管理"})
- public AjaxResult<PageInfo<TOrderVO>> listAll(OrderQuery query) {
+ public AjaxResult<PageInfo<TOrderVO>> listAll(OrderQuery query) throws ParseException {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
if (query.getEndTime()!=null){
- query.getEndTime().setHours(23);
- query.getEndTime().setMinutes(59);
- query.getEndTime().setSeconds(59);
+ Date parse = format.parse(query.getStartTime());
+ Date parse1 = format.parse(query.getEndTime());
+ query.setStartTime1(parse);
+ query.setEndTime1(parse1);
}
List<TOrderVO> list = tOrderService.listAll(query);
PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
@@ -55,7 +64,9 @@
@ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
public AjaxResult<TOrderVO> getGoodsInfo(Integer id) {
TOrder byId = tOrderService.getById(id);
+ TGoods byId2 = goodsService.getById(byId.getGoodsId());
TOrderVO tGoodsVO = new TOrderVO();
+ tGoodsVO.setName(byId2.getName());
BeanUtils.copyProperties(byId,tGoodsVO);
TUser byId1 = userService.getById(byId.getUserId());
tGoodsVO.setUserName(byId1.getName());
@@ -67,6 +78,7 @@
@ApiOperation(value = "确认发货", tags = {"后台-订单管理"})
public AjaxResult<TOrderVO> getGoodsInfo(OrderDTO dto) {
TOrder byId = tOrderService.getById(dto.getId());
+ byId.setState(2);
byId.setExpress(dto.getExpress());
byId.setExpressNumber(dto.getExpressNumber());
byId.setExpressTime(new Date());
--
Gitblit v1.7.1