Browse Source

Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

zxhxx 4 years ago
parent
commit
e86b3edd06
1 changed files with 3 additions and 0 deletions
  1. 3 0
      app/models/store/StoreExchangeOrder.php

+ 3 - 0
app/models/store/StoreExchangeOrder.php

@@ -7,6 +7,7 @@
 
 namespace app\models\store;
 
+use app\admin\model\system\SystemStore;
 use app\models\user\User;
 use crmeb\basic\BaseModel;
 use crmeb\traits\ModelTrait;
@@ -65,6 +66,8 @@ class StoreExchangeOrder extends BaseModel
                 unset($cart_info);
             }
             $v['_info'] = $_info;
+            $v['store'] = SystemStore::where('id', $v['store_id'])->value('name') ?: '--';
+            $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
         }
         $count = $model->count();
         return compact('data', 'count');