From c3540575ab149094619be6bbc7e2fa918a3f7eeb Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Thu, 11 May 2023 14:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=95=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/OrderDetailController.java          |  7 ++
 .../resources/templates/order/master.html     | 67 ++++++++++---------
 .../com/ghy/order/domain/OrderDetail.java     |  6 ++
 3 files changed, 47 insertions(+), 33 deletions(-)

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 4f333af4..a227f770 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
@@ -172,6 +172,13 @@ public class OrderDetailController extends BaseController {
                     detail.setGoods(good);
                     detail.setGoodsWorker(workerMap.get(good.getWorkerId()));
                 }
+                // 地址信息
+                CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
+                if(customerAddress != null){
+                    detail.setAddressName(customerAddress.getName());
+                    detail.setAddressPhone(customerAddress.getPhone());
+                    detail.setAddress(customerAddress.getAddress());
+                }
             }
             FinancialDetail fd = financialDetailMap.get(detail.getId());
             if (fd != null) {
diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index 9fdcf26a..e7a634f5 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -100,14 +100,16 @@
                     field: 'goods',
                     title: '订单信息',
                     formatter: function (value, row) {
-                        return '<div style="display:flex">'
-                            + '<img decoding="async" src="' + value.goodsImgUrl + '" width="120" height="120" />'
+                        return '<div style="display:flex;justify-content: center;align-items: center;">'
+                            + '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
                             + '<div>'
                             + '<small> 订单编号：' + row.code + '<small/> <br>'
                             + '<h4> ' + value.goodsName + '<h4/>'
-                            + '<small> ' + value.goodsDesc + '</small> <br>'
-                            + '<small> 创建时间：' + row.createTime + '</small> <br>'
-                            + '<small> 消费者：' + row.customerName + row.customerPhone + '</small> <br>'
+                            // + '<small> ' + value.goodsDesc + '</small> <br>'
+                            + '<small> 联系人：' + row.addressName + '</small> <br>'
+                            + '<small> 联系电话：' + row.addressPhone + '</small> <br>'
+                            + '<small> 联系地址：' + row.address + '</small> <br>'
+                            + '<small> 下单时间：' + row.createTime + '</small> <br>'
                             + '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
                             + '<small> 总金额：' + row.financialMasterMoney + '元    应得金额：' + row.financialDetailMoney + '元</small> <br>'
                             + '</div>'
@@ -122,34 +124,6 @@
                         return $.table.selectDictLabel(orderStatus, value);
                     }
                 },
-                {
-                    field: 'orderType',
-                    title: '订单类型',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(orderTypes, value);
-                    }
-                },
-                {
-                    field: 'payType',
-                    title: '付款类型',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(payTypes, value);
-                    }
-                },
-                {
-                    field: 'payStatus',
-                    title: '付款状态',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(payStatus, value);
-                    }
-                },
-                {
-                    field: 'payTime',
-                    title: '付款时间'
-                },
                 {
                     field: 'worker',
                     title: '接单信息',
@@ -180,6 +154,33 @@
                     //         + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
                     //     return actions.join('');
                     // }
+                },{
+                    field: 'orderType',
+                    title: '订单类型',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(orderTypes, value);
+                    }
+                },
+                {
+                    field: 'payType',
+                    title: '付款类型',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(payTypes, value);
+                    }
+                },
+                {
+                    field: 'payStatus',
+                    title: '付款状态',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(payStatus, value);
+                    }
+                },
+                {
+                    field: 'payTime',
+                    title: '付款时间'
                 }]
         };
         $.table.init(options);
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index f07bea21..a59bdf40 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -45,6 +45,12 @@ public class OrderDetail extends BaseEntity {
 
     @Excel(name = "消费者电话", cellType = Excel.ColumnType.STRING)
     private String customerPhone;
+    
+    private String addressPhone;
+
+    private String addressName;
+    
+    private String address;
 
     @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
     private Integer orderType;