Merge branch 'order_shipp_type'

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 '<span style="color: #ceccce">未支付</span>';
             });
+            $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);
             });

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']}",

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'];

resources/views/orderdetail.php

@@ -11,21 +11,28 @@
             <td colspan="5">联系电话：{{tel}}</td>
         </tr>
         <tr>
-            <td class="text-nowrap" scope="row">收货地址：{{address}}</td>
+            <td class="text-nowrap" scope="row" v-if="shipping_type_num == 1 || shipping_type_num == 2">收货地址：{{address}}</td>
+            <td class="text-nowrap" scope="row" v-if="shipping_type_num == 3">自提地址：{{market_name}}</td>
+
             <td colspan="5">更新时间：{{updated_at}}</td>
         </tr>
+       
+        <tr>
+            <td class="text-nowrap" scope="row" v-if="shipping_type_num == 1 || shipping_type_num == 2">预约送达时间：{{delivery_time_note}}</td>
+            <td class="text-nowrap" scope="col" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送员: {{horseman_name}}</td>
+        </tr>
         <tr>
-            <td class="text-nowrap" scope="row">预约送达时间：{{delivery_time_note}}</td>
-            <td class="text-nowrap" scope="col">配送员: {{horseman_name}}</td>
+            <td class="text-nowrap" scope="row" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送距离：{{distance}}</td>
+            <td colspan="5" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送费：{{delivery_money}} 元</td>
         </tr>
+       
         <tr>
-            <td class="text-nowrap" scope="row">配送距离：{{distance}}</td>
-            <td colspan="5">配送费：{{delivery_money}} 元</td>
+            <td class="text-nowrap" scope="row">配送方式：{{shipping_type}}</td>
+            <td class="text-nowrap" scope="col"></td>
         </tr>
         <tr>
             <td class="text-nowrap" scope="col" v-if="note">订单备注：{{note}}</td>
             <td class="text-nowrap" scope="col" v-if="refuse_refund_note">拒绝退款原因：{{refuse_refund_note}}</td>
-
         </tr>
         <tr>
             <td class="text-nowrap" scope="col" v-if="total_refund_note">退款原因：{{total_refund_note}}</td>
@@ -61,8 +68,10 @@
         总金额: {{total_money}} 元
         &ensp;&ensp;
         优惠金额: <span style="color: red">-{{coupon_money}}</span> 元
+
         &ensp;&ensp;
-        配送费: <span style="color: green">+{{delivery_money}}</span> 元
+       <span style="color: green" v-if="shipping_type_num == 1 || shipping_type_num == 2"> 配送费: +{{delivery_money}} 元</span>
+
         &ensp;&ensp;
         增值服务费: <span style="color: green">+{{services_money?services_money:0}}</span> 元
         &ensp;&ensp;