更新

addon/cashier/storeapi/controller/Goods.php

@@ -110,7 +110,16 @@ class Goods extends BaseStoreApi
             $field .= ', IFNULL(sg2.stock, 0) as stock';
         }
 
+//        $total_count = $model->getGoodsTotalCount($condition , $field, 'g', $join);
         $data = $model->getGoodsPageList($condition, $page_index, $page_size, 'g.sort asc,g.create_time desc', $field, 'g', $join);
+
+        if($data['data']){
+            $total_count = $data['data']['count'];
+            if($total_count>36){
+                $page_size = ceil($total_count/4);
+                $data = $model->getGoodsPageList($condition, $page_index, $page_size, 'g.sort asc,g.create_time desc', $field, 'g', $join);
+            }
+        }
         return $this->response($data);
     }
 

addon/cashier/storeapi/controller/Member.php

@@ -113,7 +113,7 @@ class Member extends BaseStoreApi
             'reg_time' => time(),
         ];
         if (empty($data[ 'mobile' ])) return $this->response($this->error('', '手机号不能为空'));
-        if (empty($data[ 'nickname' ])) $data[ 'nickname' ] = $data[ 'mobile' ];
+        if (empty($data[ 'nickname' ])) return $this->response($this->error('', '会员名称不能为空')); //$data[ 'nickname' ] = $data[ 'mobile' ];
 
         $member_model = new MemberModel();
         $add_res = $member_model->addMember($data);

addon/store/shop/controller/Stat.php

@@ -57,14 +57,26 @@ class Stat extends BaseShop
                 $start_time = input('end_time');
                 $end_time = input('start_time');
             }
-            $user_info = $this->user_info;
-            $user_id = $user_info['uid'];
-            $uwhere['uid'] = $user_id;
-            $UgObj = new UserGroup();
 
-            $user_store_list =$UgObj->getUserList($uwhere,'uid,store_id');
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
 
-            $store_id_arr = array_column($user_store_list['data'],'store_id');
+
+            if(!$userInfo['is_admin']){
+                $userGroupWhere['uid'] = $userInfo['uid'];
+                $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+                $store_id_arr = array_column($userGroupList['data'],'store_id');
+            }
+
+//            $user_info = $this->user_info;
+//            $user_id = $user_info['uid'];
+//            $uwhere['uid'] = $user_id;
+//            $UgObj = new UserGroup();
+//
+//            $user_store_list =$UgObj->getUserList($uwhere,'uid,store_id');
+//
+//            $store_id_arr = array_column($user_store_list['data'],'store_id');
             $stat_model = new StatModel();
 
             $data = $stat_model->getShopStatSum($this->site_id, $start_time, $end_time, $store_id,$store_id_arr);
@@ -86,7 +98,17 @@ class Stat extends BaseShop
                 $start_time = input('end_time');
                 $end_time = input('start_time');
             }
-
+            if($store_id==0){
+                $store_id_arr = [];
+                $userGroupModel = new UserGroup();
+                $userInfo = $this->user_info;
+                $userGroupWhere['uid'] = $userInfo['uid'];
+                $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+                $store_id_arr = array_column($userGroupList['data'],'store_id');
+                if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                    $store_id = $store_id_arr;
+                }
+            }
             $stat_model = new StatModel();
             $fields = $stat_model->getStatField();
             $fields[] = 'expected_earnings_total_money';
@@ -129,6 +151,19 @@ class Stat extends BaseShop
             $fields = $stat_model->getStatHourField();
             $fields[] = 'expected_earnings_total_money';
 
+            if($store_id==0){
+                $store_id_arr = [];
+                $userGroupModel = new UserGroup();
+                $userInfo = $this->user_info;
+                $userGroupWhere['uid'] = $userInfo['uid'];
+                $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+                $store_id_arr = array_column($userGroupList['data'],'store_id');
+                if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                    $store_id = $store_id_arr;
+                }
+            }
+
+
             $stat_list = $stat_model->getShopStatHourList($this->site_id, $carbon->year, $carbon->month, $carbon->day, $store_id)[ 'data' ];
 
             $data = [];

app/model/goods/Goods.php

@@ -979,7 +979,7 @@ class Goods extends BaseModel
     public function getGoodsPageList($condition = [], $page = 1, $page_size = PAGE_LIST_ROWS, $order = 'a.create_time desc', $field = 'a.goods_id,a.goods_name,a.site_id,a.site_name,a.goods_image,a.goods_state,a.price,a.goods_stock,a.goods_stock_alarm,a.create_time,a.sale_num,a.is_virtual,a.goods_class,a.goods_class_name,a.is_fenxiao,a.fenxiao_type,a.promotion_addon,a.sku_id,a.is_consume_discount,a.discount_config,a.discount_method,a.sort,a.label_id,a.is_delete', $alias = 'a', $join = [])
     {
         $res = model('goods')->pageList($condition, $field, $order, $page, $page_size, $alias, $join);
-      
+
         foreach ($res[ 'list' ] as $k => $v) {
             if (isset($v[ 'goods_stock' ])) {
                 $res[ 'list' ][ $k ][ 'goods_stock' ] = numberFormat($res[ 'list' ][ $k ][ 'goods_stock' ]);
@@ -1000,6 +1000,10 @@ class Goods extends BaseModel
         return $this->success($res);
     }
 
+    public function getGoodsTotalNum($condition , $field, $alias, $join ){
+        $count= model('goods')->getCount($condition , $field, $alias, $join );
+        return $count;
+    }
     /**
      * 编辑商品库存价格等信息
      * @param $goods_sku_array