From 7659b3de48a3cce88344125ddff56febbd877aa3 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 30 Nov 2022 00:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=95=E8=AF=A6=E6=83=85=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=B6=85=E6=97=B6=E8=AE=B0=E5=BD=95=E5=92=8C=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=B7=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/OrderDetailController.java          | 26 +++++++++++++++++++
 .../ghy/web/pojo/vo/OrderListResponse.java    |  3 +++
 .../payment/domain/OrderTimeoutRecord.java    |  3 +++
 3 files changed, 32 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 63aa880f..50c63347 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -33,7 +33,9 @@ import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import com.ghy.payment.service.OrderFineRecordService;
 import com.ghy.system.domain.SysArea;
+import com.ghy.system.domain.SysDeptConfig;
 import com.ghy.system.service.ISysAreaService;
+import com.ghy.system.service.ISysDeptConfigService;
 import com.ghy.web.pojo.vo.OrderChangePriceRequest;
 import com.ghy.web.pojo.vo.OrderListResponse;
 import com.ghy.web.pojo.vo.OrderStandard;
@@ -103,6 +105,8 @@ public class OrderDetailController extends BaseController {
     private IOrderAssessLabelService orderAssessLabelService;
     @Autowired
     private FinancialMasterService financialMasterService;
+    @Autowired
+    private ISysDeptConfigService sysDeptConfigService;
 
     @RequiresPermissions("order:detail:view")
     @GetMapping()
@@ -219,6 +223,26 @@ public class OrderDetailController extends BaseController {
             afterServiceRecord.setOrderDetailId(detail.getId());
             List<AfterServiceRecord> afterServiceRecordList  =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
 
+            // 超时记录
+            OrderTimeoutRecord timeoutRecordQry = new OrderTimeoutRecord();
+            timeoutRecordQry.setOrderDetailId(detail.getId());
+            List<OrderTimeoutRecord> orderTimeoutRecords = orderFineRecordService.selectList(timeoutRecordQry);
+            SysDeptConfig sysDeptConfig = sysDeptConfigService.selectByDeptId(request.getDeptId());
+            orderTimeoutRecords.stream().forEach(timeoutRecord -> {
+                switch (timeoutRecord.getOrderStatus()) {
+                    case 0: timeoutRecord.setPayMoney(sysDeptConfig.getPlainOutTime()); break;
+                    case 1: timeoutRecord.setPayMoney(sysDeptConfig.getGoOutTime()); break;
+                    case 2:
+                    case 3: timeoutRecord.setPayMoney(sysDeptConfig.getGoingOutTime()); break;
+                    default: break;
+                }
+            });
+
+            // 查询加价记录
+            FinancialChangeRecord changeRecordQry = new FinancialChangeRecord();
+            changeRecordQry.setOrderDetailId(detail.getId());
+            List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectFinancialChangeRecordList(changeRecordQry);
+
             // 编辑返回属性
             orderListResponse.setOrderDetailId(detail.getId());
             orderListResponse.setOrderDetailCode(detail.getCode());
@@ -253,6 +277,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setFinishImgList(finishImgList);
             orderListResponse.setWorkerRemark(detail.getRemark());
             orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
+            orderListResponse.setOrderTimeoutRecords(orderTimeoutRecords);
+            orderListResponse.setFinancialChangeRecords(financialChangeRecords);
 
             return AjaxResult.success(orderListResponse);
         } catch (Exception e) {
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 32aa8644..e3afdd97 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -3,6 +3,7 @@ package com.ghy.web.pojo.vo;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ghy.order.domain.AfterServiceRecord;
+import com.ghy.payment.domain.FinancialChangeRecord;
 import com.ghy.payment.domain.OrderTimeoutRecord;
 import lombok.Data;
 
@@ -106,4 +107,6 @@ public class OrderListResponse {
     private Integer shelveStatus;
 
     private Integer ledgerAccountStatus;
+
+    private List<FinancialChangeRecord> financialChangeRecords;
 }
diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/OrderTimeoutRecord.java b/ghy-payment/src/main/java/com/ghy/payment/domain/OrderTimeoutRecord.java
index b00ac86e..57dacdfd 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/domain/OrderTimeoutRecord.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/domain/OrderTimeoutRecord.java
@@ -2,6 +2,7 @@ package com.ghy.payment.domain;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -37,6 +38,8 @@ public class OrderTimeoutRecord {
      */
     private Date createTime;
 
+    private BigDecimal payMoney;
+
     public OrderTimeoutRecord() {
     }