1

app/admin/controller/order/StoreOrder.php

@@ -46,13 +46,26 @@ class StoreOrder extends AuthController
      */
     public function index()
     {
-        $this->assign([
-            'year' => get_month(),
-            'real_name' => $this->request->get('real_name', ''),
-            'status' => $this->request->param('status', ''),
-            'orderCount' => StoreOrderModel::orderCount(),
-            'payTypeCount' => StoreOrderModel::payTypeCount(),
-        ]);
+        $admin_id=$this->adminId;
+        $mer_id = SystemAdmin::where('id',$admin_id)->value('mer_id');
+        if ($mer_id>0){
+            $this->assign([
+                'year' => get_month(),
+                'real_name' => $this->request->get('real_name', ''),
+                'status' => $this->request->param('status', ''),
+                'orderCount' => StoreOrderModel::orderCount($mer_id),
+                'payTypeCount' => StoreOrderModel::payTypeCount(),
+            ]);
+        }else{
+            $this->assign([
+                'year' => get_month(),
+                'real_name' => $this->request->get('real_name', ''),
+                'status' => $this->request->param('status', ''),
+                'orderCount' => StoreOrderModel::orderCount(),
+                'payTypeCount' => StoreOrderModel::payTypeCount(),
+            ]);
+        }
+
         return $this->fetch();
     }
 

app/admin/model/order/StoreOrder.php

@@ -39,22 +39,40 @@ class StoreOrder extends BaseModel
 
     use ModelTrait;
 
-    public static function orderCount()
+    public static function orderCount($mer_id=0)
     {
-        $data['ys'] = self::statusByWhere(9, new self())->where(['is_system_del' => 0])->count();
-        $data['wz'] = self::statusByWhere(0, new self())->where(['is_system_del' => 0])->count();
-        $data['wf'] = self::statusByWhere(1, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->count();
-        $data['ds'] = self::statusByWhere(2, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->count();
-        $data['dp'] = self::statusByWhere(3, new self())->where(['is_system_del' => 0])->count();
-        $data['jy'] = self::statusByWhere(4, new self())->where(['is_system_del' => 0])->count();
-        $data['tk'] = self::statusByWhere(-1, new self())->where(['is_system_del' => 0])->count();
-        $data['yt'] = self::statusByWhere(-2, new self())->where(['is_system_del' => 0])->count();
-        $data['del'] = self::statusByWhere(-4, new self())->where(['is_system_del' => 0])->count();
-        $data['write_off'] = self::statusByWhere(5, new self())->where(['is_system_del' => 0])->count();
-        $data['general'] = self::where(['pink_id' => 0, 'combination_id' => 0, 'seckill_id' => 0, 'bargain_id' => 0, 'is_system_del' => 0])->count();
-        $data['pink'] = self::where('pink_id|combination_id', '>', 0)->where('is_system_del', 0)->count();
-        $data['seckill'] = self::where('seckill_id', '>', 0)->where('is_system_del', 0)->count();
-        $data['bargain'] = self::where('bargain_id', '>', 0)->where('is_system_del', 0)->count();
+        if ($mer_id>0){
+            $data['ys'] = self::statusByWhere(9, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['wz'] = self::statusByWhere(0, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['wf'] = self::statusByWhere(1, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->where('mer_id',$mer_id)->count();
+            $data['ds'] = self::statusByWhere(2, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->where('mer_id',$mer_id)->count();
+            $data['dp'] = self::statusByWhere(3, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['jy'] = self::statusByWhere(4, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['tk'] = self::statusByWhere(-1, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['yt'] = self::statusByWhere(-2, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['del'] = self::statusByWhere(-4, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['write_off'] = self::statusByWhere(5, new self())->where(['is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['general'] = self::where(['pink_id' => 0, 'combination_id' => 0, 'seckill_id' => 0, 'bargain_id' => 0, 'is_system_del' => 0])->where('mer_id',$mer_id)->count();
+            $data['pink'] = self::where('pink_id|combination_id', '>', 0)->where('is_system_del', 0)->where('mer_id',$mer_id)->count();
+            $data['seckill'] = self::where('seckill_id', '>', 0)->where('is_system_del', 0)->where('mer_id',$mer_id)->count();
+            $data['bargain'] = self::where('bargain_id', '>', 0)->where('is_system_del', 0)->where('mer_id',$mer_id)->count();
+        }else{
+            $data['ys'] = self::statusByWhere(9, new self())->where(['is_system_del' => 0])->count();
+            $data['wz'] = self::statusByWhere(0, new self())->where(['is_system_del' => 0])->count();
+            $data['wf'] = self::statusByWhere(1, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->count();
+            $data['ds'] = self::statusByWhere(2, new self())->where(['is_system_del' => 0, 'shipping_type' => 1])->count();
+            $data['dp'] = self::statusByWhere(3, new self())->where(['is_system_del' => 0])->count();
+            $data['jy'] = self::statusByWhere(4, new self())->where(['is_system_del' => 0])->count();
+            $data['tk'] = self::statusByWhere(-1, new self())->where(['is_system_del' => 0])->count();
+            $data['yt'] = self::statusByWhere(-2, new self())->where(['is_system_del' => 0])->count();
+            $data['del'] = self::statusByWhere(-4, new self())->where(['is_system_del' => 0])->count();
+            $data['write_off'] = self::statusByWhere(5, new self())->where(['is_system_del' => 0])->count();
+            $data['general'] = self::where(['pink_id' => 0, 'combination_id' => 0, 'seckill_id' => 0, 'bargain_id' => 0, 'is_system_del' => 0])->count();
+            $data['pink'] = self::where('pink_id|combination_id', '>', 0)->where('is_system_del', 0)->count();
+            $data['seckill'] = self::where('seckill_id', '>', 0)->where('is_system_del', 0)->count();
+            $data['bargain'] = self::where('bargain_id', '>', 0)->where('is_system_del', 0)->count();
+        }
+
         return $data;
     }
 

app/api/controller/user/UserController.php

@@ -528,11 +528,12 @@ class UserController
      */
     public function edit(Request $request)
     {
-        list($avatar, $nickname) = UtilService::postMore([
+        list($avatar, $nickname,$phone) = UtilService::postMore([
             ['avatar', ''],
             ['nickname', ''],
+            ['phone','']
         ], $request, true);
-        if (User::editUser($avatar, $nickname, $request->uid())) return app('json')->successful('修改成功');
+        if (User::editUser($avatar, $nickname, $request->uid(),$phone)) return app('json')->successful('修改成功');
         return app('json')->fail('修改失败');
     }
 

app/models/user/User.php

@@ -461,7 +461,7 @@ class User extends BaseModel
      */
     public static function editUser($avatar, $nickname, $uid)
     {
-        return self::edit(['avatar' => $avatar, 'nickname' => $nickname], $uid, 'uid');
+        return self::edit(['avatar' => $avatar, 'nickname' => $nickname,'phone'=>$phone], $uid, 'uid');
     }
 
     /**