提交订单详情

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/OrderDetailsAdminVo.java

+package com.liquidnet.service.kylin.dto.vo.admin;
+
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderDetailsAdminVo {
+    private KylinOrderTicketVo orderTicketVo;
+    private List<KylinOrderTicketEntitiesVo> orderTicketEntitiesVo;
+    private KylinPerformanceVo performanceVo;
+    private KylinTicketVo ticketsVo;
+    private String express_number;
+    private String express_company;
+    private Integer kuaidi_status;
+    private Long restTime;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinOrderTicketsAdminService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.admin;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 
 import java.util.List;
@@ -22,5 +22,5 @@ public interface IKylinOrderTicketsAdminService extends IService<KylinOrderTicke
     List<OrderTicketsListDao> orderList(OrderListReq orderListReq);
 
     //订单详情
-    OrderDetailsVo orderDetails(String orderId);
+    OrderDetailsAdminVo orderDetails(String orderId);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -12,16 +12,14 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 后台单订单退款 服务实现类
@@ -79,8 +77,8 @@ public class KylinOrderRefundAdminController extends BaseController {
 
     @PostMapping("applyOrder")
     @ResponseBody
-    public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
-        OrderDetailsVo orderInfo = kylinOrderTicketsAdminServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId());
+    public OrderDetailsAdminVo applyOrder(RefundApplyParam refundApplyParam) {
+        OrderDetailsAdminVo orderInfo = kylinOrderTicketsAdminServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId());
         return orderInfo;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java

@@ -4,7 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class KylinOrderTicketsController extends BaseController
     @RequiresPermissions("kylin:order:orderlist:detail")
     @GetMapping("/orderList/detail/{orderId}")
     public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) {
-        OrderDetailsVo orderDetailsVo = iKylinOrderTicketsAdminService.orderDetails(orderId);
+        OrderDetailsAdminVo orderDetailsVo = iKylinOrderTicketsAdminService.orderDetails(orderId);
         mmap.put("orderDetailsVo", orderDetailsVo);
         return prefix + "/orderList/details";
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/monitor/operlog/detail.html

@@ -10,7 +10,7 @@
 		<div class="form-group">
 			<label class="col-sm-2 control-label">操作模块：</label>
 			<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${@dict.getLabel('sys_oper_type',operLog.businessType)}">
-			</div>
+			</div>x
 		</div>
 		<div class="form-group">
 			<label class="col-sm-2 control-label">登录信息：</label>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

@@ -8,11 +8,11 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
@@ -72,8 +72,8 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
     }
 
     @Override
-    public OrderDetailsVo orderDetails(String orderId) {
-        OrderDetailsVo vo = new OrderDetailsVo();
+    public OrderDetailsAdminVo orderDetails(String orderId) {
+        OrderDetailsAdminVo vo = new OrderDetailsAdminVo();
         try {
             //查询条件
             LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
@@ -145,6 +145,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
                 vo.setExpress_number("");
                 vo.setExpress_company("");
                 vo.setKuaidi_status(-2);
+                vo.setTicketsVo(ticketVo);
                 vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList);
                 vo.setPerformanceVo(performanceVo);
                 vo.setOrderTicketVo(orderTicketVo);