xxxrrrdddd 3 years ago
parent
commit
2fe7d6a8ee

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

@@ -58,7 +58,7 @@ class MobileOrder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                ->with(['info','operation','operation.admin','admin'])
+                ->with(['info','operation','operation.admin','admin','admin.admin'])
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);
@@ -126,6 +126,7 @@ class MobileOrder extends Backend
             $model['amount_refund']=$data['amount'];
             $model['refund_no']=session_create_id();
             Refund::setType($model)->refund();
+            $model['status']=\app\common\model\MobileOrder::STATUS_REFUNDED;
             $model->save();
 
             Db::commit();

+ 4 - 0
application/admin/model/MobileOrderAdmin.php

@@ -17,4 +17,8 @@ class MobileOrderAdmin extends Model
             ]);
         }
     }
+
+    public function admin(){
+        return $this->belongsTo(Admin::class,'admin_id','id',[])->setEagerlyType(0);
+    }
 }

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

@@ -15,6 +15,7 @@ class MobileOrder extends Model
 {
     const STATUS_WAIT_SEND=10;
     const STATUS_REFUND=30;
+    const STATUS_REFUNDED=90;
     public static $status=[
         0=>'待付款',
         self::STATUS_WAIT_SEND=>'已付款',

+ 2 - 2
public/assets/js/backend/mobile_order.js

@@ -70,8 +70,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             },operate:false},
                         {field: '', title: __('操作员'),formatter(_,order){
                                 let a=[]
-                                order.operation.forEach(item=>{
-                                    a.push(`<div>${item.create_time_format_short} ${item.admin?item.admin.nickname:'-'} ${item.content}</div>`)
+                                order.admin.forEach(item=>{
+                                    a.push(`<div>${item.admin.nickname}</div>`)
                                 })
                                 return `<div style="text-align: left;font-size: 10px;">${a.join('')}</div>`
                             },operate:false},