xxxrrrdddd 2 years ago
parent
commit
8a2d90fbf1

+ 2 - 0
application/admin/controller/MobileOrder.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use app\admin\model\Admin;
 use app\admin\model\MobileOrderAdmin;
 use app\common\controller\Backend;
+use app\common\model\LogisticsCompany;
 use app\common\model\MobileOrderOperation;
 use app\common\service\MobileOrderExport;
 use app\common\service\Refund;
@@ -109,6 +110,7 @@ class MobileOrder extends Backend
             $row['address']=$model->originData()['address'];
             $row['city']=\app\common\model\Area::getNameString($row['city'],'/');
             $this->assign('row',$row);
+            $this->assign('logistics_list',json_encode(LogisticsCompany::all()));
             return view();
         }else{
             $data=input('row/a');

+ 2 - 0
application/admin/controller/MobileOrderFlow.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 use app\admin\model\MobileOrderAdmin;
 use app\common\controller\Backend;
+use app\common\model\LogisticsCompany;
 use app\common\model\MobileOrderOperation;
 use app\common\service\Refund;
 use think\Db;
@@ -84,6 +85,7 @@ class MobileOrderFlow extends Backend
             $row['address']=$model->originData()['address'];
             $row['city']=\app\common\model\Area::getNameString($row['city'],'/');
             $this->assign('row',$row);
+            $this->assign('logistics_list',json_encode(LogisticsCompany::all()));
             return view();
         }else{
             $data=input('row/a');

+ 2 - 1
application/admin/view/mobile_order/edit.html

@@ -32,7 +32,8 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('物流名称')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-trans_name" class="form-control" name="row[trans_name]" type="text" value="{$row.trans_name|htmlentities}">
+            <!--<input id="c-trans_name" class="form-control" name="row[trans_name]" type="text" value="{$row.trans_name|htmlentities}">-->
+            <input id="c-trans_id" data-rule="required" data-source='{$logistics_list}' class="form-control selectpage" name="row[trans_id]" type="text" value="{$row.trans_id}">
         </div>
     </div>
     <div class="form-group">

+ 2 - 1
application/admin/view/mobile_order_flow/edit.html

@@ -32,7 +32,8 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('物流名称')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-trans_name" class="form-control" name="row[trans_name]" type="text" value="{$row.trans_name|htmlentities}">
+            <!--<input id="c-trans_name" class="form-control" name="row[trans_name]" type="text" value="{$row.trans_name|htmlentities}">-->
+            <input id="c-trans_id" data-rule="required" data-source='{$logistics_list}' class="form-control selectpage" name="row[trans_id]" type="text" value="{$row.trans_id}">
         </div>
     </div>
     <div class="form-group">

+ 3 - 1
application/common/model/LogisticsCompany.php

@@ -9,5 +9,7 @@ use think\Model;
  */
 class LogisticsCompany Extends Model
 {
-
+    public static function getNameById($id){
+        return self::where('id',$id)->value('name');
+    }
 }

+ 5 - 0
application/common/model/MobileOrder.php

@@ -141,6 +141,11 @@ class MobileOrder extends Model
                 ]);
             }
 
+            #物流信息
+            if(!empty($data['trans_id'])){
+                $mobileOrder['trans_name']=LogisticsCompany::getNameById($data['trans_id']);
+            }
+
             #发货短信通知
             if(isset($data['status']) && $data['status']==20){
                 SmsSend::orderSend($mobileOrder['phone'],$mobileOrder['trans_name'],$mobileOrder['trans_no']);