From f289363967a5ff135dcc62b023f4252aed1e01d9 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 23 Sep 2020 18:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E9=85=8D=E9=80=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ImsCjdcOrderMainController.php | 4 +++-
app/Admin/Extensions/MyDetailPage.php | 2 ++
app/Models/ImsCjdcOrderMain.php | 8 ++++++-
resources/views/orderdetail.php | 23 +++++++++++++------
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index ac463a2..d7d0121 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -51,7 +51,6 @@ class ImsCjdcOrderMainController extends AdminController
$grid->model()->where('market_id',$marketId);
}
-
$grid->column('nick_name', '用户信息');
$grid->order_num;
$grid->state('订单状态')
@@ -65,6 +64,9 @@ class ImsCjdcOrderMainController extends AdminController
}
return '未支付';
});
+ $grid->column('shipping_type', '配送方式')
+ ->using(config('order.shipping_type'))
+ ->label([1 => '#FF9900', 2 => '#99CCFF', 3 => '#CCCCCC']);
$grid->created_at('下单时间')->display(function ($time) {
return date('Y-m-d H:i:s',$time);
});
diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index 223b565..92c6c9e 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -40,6 +40,7 @@ class MyDetailPage extends LazyRenderable
el:"#detail",
data:{
dialogFormVisible: false,
+ market_name: "{$order['market_name']}",
order_num: "{$order['order_num']}",
name: "{$order['name']}",
state: "{$order['state']}",
@@ -47,6 +48,7 @@ class MyDetailPage extends LazyRenderable
updated_at: "{$order['updated_at']}",
pay_type: "{$order['pay_type']}",
shipping_type: "{$order['shipping_type']}",
+ shipping_type_num: "{$order['shipping_type_num']}",
tel: "{$order['tel']}",
delivery_time_note: "{$order['delivery_time_note']}",
refuse_refund_note: "{$order['refuse_refund_note']}",
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index 4a655ee..741661b 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -4,7 +4,7 @@ namespace App\Models;
use App\Admin\Common\Rpc;
use Dcat\Admin\Traits\HasDateTimeFormatter;
-
+use App\Models\v3\Market as MarketModel;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
@@ -58,9 +58,15 @@ class ImsCjdcOrderMain extends Model
$order['created_at'] = date('Y-m-d H:i:s', $order['created_at']);
$order['updated_at'] = $order['updated_at'] ? date('Y-m-d H:i:s', $order['updated_at']) : null;
$order['pay_type'] = config('order.pay_type')[$order['pay_type']];
+ $order['shipping_type_num'] = $order['shipping_type'];
$order['shipping_type'] = config('order.shipping_type')[$order['shipping_type']];
$order['horseman_name'] = $order['shipping_name']??LanzuServiceHorseman::getName($order['horseman_id']);
+ // 获取市场
+ $marketId = $order['market_id']?$order['market_id']:0;
+ $market = MarketModel::getMarketInfo($marketId,'name');
+ $order['market_name'] = $market?$market['name']:'';
+
//获取市场经纬度
//$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray();
//$order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result'];
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 0aab4c0..e5680e3 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -11,21 +11,28 @@
| 联系电话：{{tel}} |
- | 收货地址：{{address}} |
+ 收货地址：{{address}} |
+ 自提地址：{{market_name}} |
+
更新时间：{{updated_at}} |
+
+
+ | 预约送达时间：{{delivery_time_note}} |
+ 配送员: {{horseman_name}} |
+
- | 预约送达时间：{{delivery_time_note}} |
- 配送员: {{horseman_name}} |
+ 配送距离：{{distance}} |
+ 配送费：{{delivery_money}} 元 |
+
- | 配送距离：{{distance}} |
- 配送费：{{delivery_money}} 元 |
+ 配送方式：{{shipping_type}} |
+ |
| 订单备注：{{note}} |
拒绝退款原因：{{refuse_refund_note}} |
-
| 退款原因：{{total_refund_note}} |
@@ -61,8 +68,10 @@
总金额: {{total_money}} 元
优惠金额: -{{coupon_money}} 元
+
- 配送费: +{{delivery_money}} 元
+ 配送费: +{{delivery_money}} 元
+
增值服务费: +{{services_money?services_money:0}} 元