1

addon/cashier/storeapi/controller/Goods.php

@@ -57,6 +57,7 @@ class Goods extends BaseStoreApi
         $start_price = $this->params[ 'start_price' ] ?? 0;
         $end_price = $this->params[ 'end_price' ] ?? 0;
 
+
         $model = new GoodsModel();
         $condition = [
             [ 'g.site_id', '=', $this->site_id ],
@@ -108,7 +109,7 @@ class Goods extends BaseStoreApi
             $join[] = [ 'store_goods sg2', 'g.goods_id = sg2.goods_id and sg2.store_id=' . $stock_store_id, 'left' ];
             $field .= ', IFNULL(sg2.stock, 0) as stock';
         }
-       
+
         $data = $model->getGoodsPageList($condition, $page_index, $page_size, 'g.sort asc,g.create_time desc', $field, 'g', $join);
         return $this->response($data);
     }

app/shop/controller/User.php

@@ -10,6 +10,7 @@
 
 namespace app\shop\controller;
 
+use app\model\member\Member;
 use app\model\store\Store;
 use app\model\system\Group;
 use app\model\system\Menu;
@@ -46,8 +47,9 @@ class User extends BaseShop
             if ($status != "") {
                 $condition[ "status" ] = [ "status", "=", $status ];
             }
-
             $user_model = new UserModel();
+
+
             $list = $user_model->getUserPageList($condition, $page, $page_size, "is_admin desc,create_time desc");
             if (!empty($list['data']['list']) && addon_is_exit('cashier', $this->site_id)) {
                 $join = [