1557492053 3 lat temu
rodzic
commit
0b24ca9961

+ 4 - 1
app/common/model/AuthRuleModel.php

@@ -28,7 +28,10 @@ class AuthRuleModel extends BaseModel
         return $this->where([
             ['is_delete','=',0],
             ['id','in', $ids]
-        ])->order("weigh","desc")->select()->toArray();
+        ])
+            ->order("weigh","desc")
+            ->select()
+            ->toArray();
     }
 
 

+ 3 - 1
app/common/model/CustomerModel.php

@@ -44,7 +44,9 @@ class CustomerModel extends BaseModel
         if(isset($params['mobile']))
             array_push($where,['mobile', 'like', "%".$params['mobile']."%"]);
 
-        return $this->where($where)->order('create_time','desc')->paginate(['list_rows'=>10, "query" => $params]);
+        return $this->where($where)
+            ->order('create_time','desc')
+            ->paginate(['list_rows'=>10, "query" => $params]);
 
     }
 

+ 2 - 2
app/common/model/OrderAnnualFeeModel.php

@@ -31,8 +31,8 @@ class OrderAnnualFeeModel extends BaseModel
         if ($start_time) array_push($where, ['order_create_time', '>=', $start_time]);
         if ($end_time) array_push($where, ['order_create_time', '<=', $end_time]);
         return $this->where($where)
-            ->page($page, $size)
-            ->paginate();
+            ->page($page)
+            ->paginate($size);
 
     }
 

+ 12 - 3
app/common/model/OrderModel.php

@@ -110,14 +110,18 @@ class OrderModel extends BaseModel
         }
         return $query->order('update_time', 'desc')
             ->page($params['page'] ?? 1)
-            ->paginate($params['size'] ?? 10)->toArray();
+            ->paginate($params['size'] ?? 10)
+            ->toArray();
     }
 
     public function fetchOrderByCustomerId($c_id) {
         return $this->where([
             ['is_delete', '=', 0],
             ['customer_id', '=', $c_id]
-        ])->select()->toArray();
+        ])
+            ->order('create_time','desc')
+            ->select()
+            ->toArray();
     }
 
     /**
@@ -131,7 +135,12 @@ class OrderModel extends BaseModel
         return $this->where([
             ['is_delete', '=', 0],
             ['customer_id', '=', $customer_id]
-        ])->with(['products'])->order('update_time', 'desc')->page($page)->paginate($size)->toArray();
+        ])
+            ->with(['products'])
+            ->order('update_time', 'desc')
+            ->page($page)
+            ->paginate($size)
+            ->toArray();
     }
 
 

+ 5 - 1
app/common/model/ProductModel.php

@@ -48,7 +48,11 @@ class ProductModel extends BaseModel
         if(strlen($text) > 0) {
             array_push($or_where, ['name|bar_code', 'like', '%'.$text.'%']);
         }
-        return $this->where('is_delete', 0)->where($or_where)->page(1,10)->select();
+        return $this
+            ->where('is_delete', 0)
+            ->where($or_where)
+            ->page(1,10)
+            ->select();
     }
 
     public function doesItExist($bar_code) {

+ 3 - 1
app/common/model/StoreModel.php

@@ -28,6 +28,8 @@ class StoreModel extends BaseModel
         $where = [
             ['is_delete', '=', 0]
         ];
-        return $this->where($where)->order('create_time','desc')->paginate(['list_rows'=>10, "query" => $params]);
+        return $this->where($where)
+            ->order('create_time','desc')
+            ->paginate(['list_rows'=>10, "query" => $params]);
     }
 }

+ 3 - 0
app/common/model/StoreProductModel.php

@@ -78,6 +78,7 @@ class StoreProductModel extends BaseModel
 
         return $this->where($where)
             ->with('product')
+            ->order('create_time','desc')
             ->page($params['page'])
             ->paginate($params['size'] ?? 10);
     }
@@ -88,6 +89,7 @@ class StoreProductModel extends BaseModel
             ['is_delete', '=', 0]
         ];
         return $this->where($where)
+            ->order('create_time','desc')
             ->with('product')
             ->select();
     }
@@ -99,6 +101,7 @@ class StoreProductModel extends BaseModel
             ['is_delete', '=', 0]
         ];
         return $this->where($where)
+            ->order('create_time','desc')
             ->select();
     }
 

+ 3 - 1
app/common/model/UserModel.php

@@ -26,7 +26,9 @@ class UserModel extends BaseModel
         ];
         if(!is_null($params['store_id']) && $params['store_id'] > 0)
             array_push($where, ['store_id', '=', $params['store_id']]);
-        return $this->where($where)->order('create_time','desc')->paginate(['list_rows'=>10, "query" => $params]);
+        return $this->where($where)
+            ->order('create_time','desc')
+            ->paginate(['list_rows'=> 10, "query" => $params]);
     }
 
 }