From c4a098e3f88bc5071e36b92b9e5dcceb51129957 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:25:07 +0800
Subject: [PATCH] 同步后台代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCancelOrderServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCancelOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCancelOrderServiceImpl.java
index 3dc40f4..9366c42 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCancelOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCancelOrderServiceImpl.java
@@ -1,15 +1,20 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.modular.system.controller.resp.TOrderResp;
import com.stylefeng.guns.modular.system.model.TCancelOrder;
import com.stylefeng.guns.modular.system.dao.TCancelOrderMapper;
import com.stylefeng.guns.modular.system.service.ITCancelOrderService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.service.ITOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
+import java.text.SimpleDateFormat;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -24,6 +29,8 @@
@Autowired
private TCancelOrderMapper tCancelOrderMapper;
+ @Autowired
+ private ITOrderService tOrderService;
@Override
public List<TOrderResp> getCancelOrderList(String createTime, String code, Integer source, String userName, String userPhone, Integer state, String driverName) {
@@ -35,6 +42,25 @@
startTime = split[0];
endTime = split[1];
}
- return tCancelOrderMapper.getCancelOrderList(startTime,endTime,code,source,userName,userPhone,state,driverName);
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ return tCancelOrderMapper.getCancelOrderList(startTime,endTime,code,source,userName,userPhone,state,driverName,roleType,objectId);
+ }
+
+ @Override
+ public void cancelOrderDetail(Integer cancelOrderId, Model model) {
+
+ // 查询取消订单记录
+ TCancelOrder tCancelOrder = tCancelOrderMapper.selectById(cancelOrderId);
+
+ model.addAttribute("cancelTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tCancelOrder.getCreateTime()));
+ model.addAttribute("cause",tCancelOrder.getCause());
+
+ tOrderService.orderDetail(tCancelOrder.getOrderId(),model);
+ }
+
+ @Override
+ public List<TOrderResp> userCancelOrderList(Integer userId,Integer orderId) {
+ return tCancelOrderMapper.userCancelOrderList(userId,orderId);
}
}
--
Gitblit v1.7.1