fix():修改配置

application/api/controller/Order.php

@@ -79,7 +79,7 @@ class Order extends BaseController {
         if (!empty($input['writeOffStatus'])) {
             if (empty($input['foodOrder'])) {
                 $where[] = ['wo.write_off_status', '=', (int)$input['writeOffStatus']];
-            }else if ($input['foodOrder'] == 2){
+            } else if ($input['foodOrder'] == 2) {
                 $model->setOp('write_off_status', 'left');
             }
         }
@@ -270,14 +270,14 @@ class Order extends BaseController {
             $rs = $model::where(['mobile' => $input['mobile']])->find();
             if (empty($rs)) {
                 $id = $model->insertGetId([
-                    'name'          => $input['name'],
-                    'avatar'        => '',
-                    'mobile'        => $input['mobile'],
-                    'join_type'     => 2,
+                    'real_name' => $input['name'],
+                    'avatar'    => '',
+                    'mobile'    => $input['mobile'],
+                    'join_type' => 2,
                 ]);
                 $input['userId'] = $id;
-            }else {
-                $rs = $model::where(['id' => $rs['id']])->update(['name' => $input['name']]);
+            } else {
+                $rs = $model::where(['id' => $rs['id']])->update(['real_name' => $input['name']]);
                 $input['userId'] = $rs['id'];
             }
         }
@@ -307,7 +307,7 @@ class Order extends BaseController {
         $input = Until::getInput();
         $rule = [
             'cartId|商品id和数量' => 'require',
-            'tableId|桌台id' => 'require',
+            'tableId|桌台id'   => 'require',
         ];
         Until::check($rule, $input);
         $data = (new OrderService())->payFoodOrder($input);
@@ -342,14 +342,14 @@ class Order extends BaseController {
         $model = new OrderModel();
         $model::where(['id' => (int)$input['orderId']])->update(['staff_id' => (int)$input['staffId']]);
         $allocateModel = new AllocateModel();
-        $rs = $allocateModel::where(['order_id' => (int)$input['orderId'],'staff_id' => $input['staffId']])->find();
+        $rs = $allocateModel::where(['order_id' => (int)$input['orderId'], 'staff_id' => $input['staffId']])->find();
         if (empty($rs)) {
             $allocateModel->insertGetId([
                 'order_id' => (int)$input['orderId'],
                 'staff_id' => $input['staffId'],
                 'admin_id' => $this->adminId
             ]);
-        }else {
+        } else {
             $allocateModel::where(['id' => $rs['id']])->update(['staff_id' => $input['staffId']]);
         }
         Until::output();
@@ -394,9 +394,9 @@ class Order extends BaseController {
             throw new ApiException('该订单已不是pad端下单');
         }
         $model::where(['id' => (int)$input['orderId']])->update([
-            'status' => OrderModel::IS_PAY,
+            'status'   => OrderModel::IS_PAY,
             'pay_type' => $input['payType'],
-            'remark' => $input['remark'],
+            'remark'   => $input['remark'],
             'pay_time' => date('Y-m-d H:i:s')
         ]);
         Db::table('pay_record')->insertGetId(['order_id' => $input['orderId'], 'admin_id' => $this->adminId]);
@@ -575,14 +575,14 @@ class Order extends BaseController {
             throw new ApiException('不存在的购物车id');
         }
         $cartProductModel = new CartProductModel();
-        $rs  = $cartProductModel::where(['product_id' => $input['productId'], 'cart_id' => $input['cartId']])->find();
+        $rs = $cartProductModel::where(['product_id' => $input['productId'], 'cart_id' => $input['cartId']])->find();
         if (empty($rs)) {
             $cartProductModel->insertGetId([
                 'product_id' => $input['productId'],
-                'cart_id' => $input['cartId'],
-                'num' => $input['num'] ?? 1
+                'cart_id'    => $input['cartId'],
+                'num'        => $input['num'] ?? 1
             ]);
-        }else {
+        } else {
             if ($input['type'] == 1) {
                 $cartProductModel::where(['id' => $rs['id']])->inc('num', 1)->update();
             }
@@ -660,7 +660,7 @@ class Order extends BaseController {
             $model->setFields('c.*,cp.product_id,cp.num,p.product_name,p.current_price,p.product_img');
             $rs = $model->getCartList();
             $model->commit();
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             $model->rollback();
             throw new ApiException($e->getMessage());
         }

application/api/controller/Product.php

@@ -204,6 +204,7 @@ class Product extends BaseController {
      *           @OA\Property(description="状态 1正常  2下架", property="status", type="integer", default="1"),
      *           @OA\Property(description="产品类型id", property="productTypeId", type="integer", default="1"),
      *           @OA\Property(description="产品分类 1 洗浴 2小食", property="type", type="integer", default="1"),
+     *           @OA\Property(description="产品时间 单位分钟", property="time", type="integer", default="1"),
      *           required={"name","imgUrl","oldPrice","currentPrice","companyId","brandId","productContent"})
      *       )
      *     ),
@@ -220,7 +221,8 @@ class Product extends BaseController {
             'companyId|公司id'      => 'require',
             'brandId|品牌id'        => 'require',
             'productContent|产品内容' => 'require',
-            'productTypeId|产品类型'    => 'require'
+            'productTypeId|产品类型'    => 'require',
+            'time|产品时间'    => 'require'
         ];
         Until::check($rule, $input);
         $model = new ProductModel();
@@ -235,6 +237,7 @@ class Product extends BaseController {
                 'brand_id'        => $input['brandId'],
                 'product_content' => $input['productContent'],
                 'product_type_id' => $input['productTypeId'],
+                'time' => $input['time'],
                 'status'          => $input['status'] ?? 1,
             ]);
         } else {
@@ -248,6 +251,7 @@ class Product extends BaseController {
                 'product_content' => $input['productContent'],
                 'status'          => $input['status'] ?? 1,
                 'product_type_id' => $input['productTypeId'],
+                'time' => $input['time'],
                 'type'            => $input['type'] ?? 1
             ]);
         }

application/api/controller/Staff.php

@@ -26,6 +26,7 @@ class Staff extends BaseController {
      *   @OA\Parameter(name="name", in="query", description="职员名", @OA\Schema(type="string")),
      *   @OA\Parameter(name="mobile", in="query", description="手机号", @OA\Schema(type="string")),
      *   @OA\Parameter(name="storeId", in="query", description="门店（多个逗号分隔）", @OA\Schema(type="integer")),
+     *   @OA\Parameter(name="groupId", in="query", description="集团（多个逗号分隔）", @OA\Schema(type="integer")),
      *   @OA\RequestBody(
      *     ),
      *   @OA\Response(response="200", description="请求成功")
@@ -54,6 +55,11 @@ class Staff extends BaseController {
             $arr =  explode(',',$input['storeId']);
             $where[] = ['s.store_id', 'in', $arr];
         }
+
+        if (!empty($input['groupId'])) {
+            $arr =  explode(',',$input['groupId']);
+            $where[] = ['s.group_id', 'in', $arr];
+        }
         $model->setWhere($where);
         $data = $model->getStaffList();
         Until::output($data);

application/api/model/StaffModel.php

@@ -18,9 +18,10 @@ class StaffModel  extends BaseModel {
             ->join('staff_title st','st.id = s.staff_title_id','left');
 
         $selectModel = $this->alias('s')
-            ->field('s.*,sto.store_name,st.staff_title')
+            ->field('s.*,sto.store_name,st.staff_title,sto.groupId,g.group_name')
             ->join('store sto','sto.id = s.store_id')
             ->join('staff_title st','st.id = s.staff_title_id','left')
+            ->join('group g','g.id = sto.group_id','left')
             ->order(['s.id' => 'desc']);
         return $this->joinModelPageList($countModel, $selectModel);
     }