wang jun 2 gadi atpakaļ
vecāks
revīzija
d582ea61c6

+ 7 - 6
application/api/logic/MealLogic.php

@@ -1,8 +1,8 @@
 <?php
 namespace app\api\logic;
 
-use app\common\model\CookbookModel;
 use app\common\model\MealcenterModel;
+use app\common\model\MealcookModel;
 use app\common\model\MealModel;
 use app\common\model\MealOrdersModel;
 use app\common\model\UserAddressModel;
@@ -72,15 +72,15 @@ class MealLogic
         if (empty($mlist)) {
             return backarr(0, "无数据");
         }
-        $m_c = new CookbookModel();
+        $m_mc = new MealcookModel();
         foreach ($mlist as $key => $value) {
-            $value['cooks'] = $m_c->getcooks($center_id, $value['id']);
+            $value['cooks'] = $m_mc->getcooks($center_id, $value['id']);
             $mlist[$key] = $value;
         }
         return backarr(1, "查询成功", $mlist);
     }
     /**
-     * 创建订单
+     * 创建订单 待改
      *
      * @return void
      * @author wj
@@ -139,8 +139,9 @@ class MealLogic
                 }
             }
             $many = bcmul($quantity, $minfo['price'], 2);
-            $m_c = new CookbookModel();
-            $cooks = $m_c->getcooks($center_id, $meal_id)->toArray();
+            //$m_c = new CookbookModel();
+            $m_mc = new MealcookModel();
+            $cooks = $m_mc->getcooks($center_id, $meal_id);
             $cooksids = implode(',', array_column($cooks, 'id'));
             $orderno = date('ymdhis') . $center_id . $meal_id . $userid;
             $remark = isset($arr['remark']) ? $arr['remark'] : '';

+ 0 - 21
application/common/model/CookbookModel.php

@@ -80,25 +80,4 @@ class CookbookModel extends Model
         }
         return $data;
     }
-    /**
-     * 返回当日菜单 根据中心id和套餐id
-     *
-     * @param  [type] $center_id
-     * @param  [type] $meal_id
-     * @return void
-     * @author wj
-     * @date 2022-12-02
-     */
-    public function getcooks($center_id,$meal_id){
-        $week = getweek();
-        $is_active =1;
-        $where = [
-            'center_id' => $center_id,
-            'week' => $week,
-            'meal_id' => $meal_id,
-            'is_active' => $is_active,
-        ];
-        $list = $this->where($where)->select();
-        return empty($list)?[]:$list;
-    }
 }

+ 33 - 0
application/common/model/MealModel.php

@@ -80,4 +80,37 @@ class MealModel extends Model
         }
         return $data;
     }
+    /**
+     * 获取列表join配送中心
+     *
+     * @param  array   $where
+     * @param  string  $field
+     * @param  integer $page
+     * @param  integer $size
+     * @param  string  $order
+     * @param  string  $group
+     * @param  boolean $row
+     * @return void
+     * @author wj
+     * @date 2022-12-07
+     */
+    public function getListJoinCenter($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->alias('m')->join("t_mealcenter mc", "m.center_id=mc.id")->where($where);
+        if ("count" != $field) {
+            if (empty($size)) {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group);
+            } else {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            }
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj->count();
+        }
+        return $data;
+    }
 }

+ 144 - 0
application/common/model/MealcookModel.php

@@ -0,0 +1,144 @@
+<?php
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * 套餐菜单
+ *
+ * @author wj
+ * @date 2022-12-07
+ */
+class MealcookModel extends Model
+{
+    protected $table = "t_mealcook";
+
+    public function insertData($data)
+    {
+        if (!isset($data['createtime']) || empty($data['createtime']) || !is_string($data['createtime'])) {
+            $data['createtime'] = date("Y-m-d H:i:s");
+        }
+        if (isset($data['id'])) {
+            unset($data['id']);
+        }
+        $data = $this->formatData($data);
+        if (empty($data)) {
+            return false;
+        }
+        $id = $this->insertGetId($data);
+        return $id ? $id : false;
+    }
+
+    /**
+     * 校验入库数据
+     * 20220119
+     */
+    private function formatData($data)
+    {
+        $useData = [];
+        $fields = $this->getTableFields();
+        foreach ($data as $key => $value) {
+            if (in_array($key, $fields)) {
+                $useData[$key] = $value;
+            }
+        }
+        return $useData;
+    }
+    public function getInfo($where, $field = "*", $row = true)
+    {
+        $info = $this->field($field)->where($where);
+        if ($row) {
+            $info = $info->find();
+        } else {
+            $info = $info->select();
+        }
+        return empty($info) ? false : $info;
+    }
+
+    public function updateinfo($where, $updateData)
+    {
+        $row = $this->where($where)->update($updateData);
+        return empty($row) ? false : $row;
+    }
+
+    public function deleteinfo($where)
+    {
+        $row = $this->where($where)->delete();
+        return empty($row) ? false : $row;
+    }
+
+    public function getList($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->where($where);
+        if ("count" != $field) {
+            if (empty($size)) {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group);
+            } else {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            }
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj->count();
+        }
+        return $data;
+    }
+    /**
+     * 获取列表join菜单表
+     *
+     * @param  array   $where
+     * @param  string  $field
+     * @param  integer $page
+     * @param  integer $size
+     * @param  string  $order
+     * @param  string  $group
+     * @param  boolean $row
+     * @return void
+     * @author wj
+     * @date 2022-12-07
+     */
+    public function getListJoinCB($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->alias('mc')->join("t_cookbook cb", "mc.cook_id=cb.id")->where($where);
+        if ("count" != $field) {
+            if (empty($size)) {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group);
+            } else {
+                $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            }
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj->count();
+        }
+        return $data;
+    }
+
+    /**
+     * 返回当日菜单 根据中心id和套餐id
+     *
+     * @param  [type] $center_id
+     * @param  [type] $meal_id
+     * @return void
+     * @author wj
+     * @date 2022-12-02
+     */
+    public function getcooks($center_id, $meal_id)
+    {
+        $week = getweek();
+        $where = [
+            'mc.center_id' => $center_id,
+            'mc.week' => $week,
+            'mc.meal_id' => $meal_id,
+        ];
+        $field = ['mc.meal_id', 'mc.center_id', 'mc.week', 'cb.*'];
+        $list = $this->getListJoinCB($where, $field, 1, 0);
+        return empty($list) ? [] : $list->toArray();
+    }
+}

+ 70 - 0
application/common/model/rolesmodel.php

@@ -0,0 +1,70 @@
+<?php
+/*
+ * @Author: wang jun
+ * @Date: 2021-10-29 16:06:41
+ * @Last Modified by: wang jun
+ * @Last Modified time: 2021-10-29 16:15:16
+ */
+namespace app\common\model;
+
+use think\Model;
+
+class rolesmodel extends Model
+{
+
+    protected $table = 't_roles';
+
+    public function insertData($data)
+    {
+        $field = $this->getTableFields();
+        $insertData = [];
+        foreach ($field as $key => $value) {
+            if (in_array($value, array_keys($data))) {
+                $insertData[$value] = $data[$value];
+            }
+        }
+        unset($insertData['id']);
+        $data = $insertData;
+        $id = $this->insertGetId($data);
+        return empty($id) ? false : $id;
+    }
+
+    public function getInfo($where, $field = "*", $row = true)
+    {
+        $info = $this->field($field)->where($where);
+        if ($row) {
+            $info = $info->find();
+        } else {
+            $info = $info->select();
+        }
+        return empty($info) ? false : $info;
+    }
+
+    public function updateinfo($where, $updateData)
+    {
+        $row = $this->where($where)->update($updateData);
+        return empty($row) ? false : $row;
+    }
+
+    public function deleteinfo($where)
+    {
+        $row = $this->where($where)->delete();
+        return empty($row) ? false : $row;
+    }
+
+    public function getList($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->where($where);
+        if ("count" != $field) {
+            $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj = $sqlObj->count();
+        }
+        return $data;
+    }
+}

+ 68 - 0
application/common/model/roleusermodel.php

@@ -0,0 +1,68 @@
+<?php
+/*
+ * @Author: wang jun
+ * @Date: 2021-10-29 16:06:41
+ * @Last Modified by: wang jun
+ * @Last Modified time: 2021-11-09 17:42:32
+ */
+namespace app\common\model;
+
+use think\Model;
+
+class roleusermodel extends Model
+{
+
+    protected $table = 't_roleuser';
+
+    public function insertData($data)
+    {
+        $id = $this->insertGetId($data);
+        return empty($id) ? false : $id;
+    }
+
+    public function getInfo($where, $field = "*", $row = true)
+    {
+        $info = $this->field($field)->where($where);
+        if ($row) {
+            $info = $info->find();
+        } else {
+            $info = $info->select();
+        }
+        return empty($info) ? false : $info;
+    }
+
+    public function updateinfo($where, $updateData)
+    {
+        $row = $this->where($where)->update($updateData);
+        return empty($row) ? false : $row;
+    }
+
+    public function deleteinfo($where)
+    {
+        $row = $this->where($where)->delete();
+        return empty($row) ? false : $row;
+    }
+
+    public function getList($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->where($where);
+        if ("count" != $field) {
+            $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj = $sqlObj->count();
+        }
+        return $data;
+    }
+
+    public function getinfoforuser($uid)
+    {
+        $sql = "select r.* from t_roleuser as ru join t_roles as r on r.id = ru.rid where ru.uid='" . $uid . "' and r.is_active=1";
+        $result = $this->query($sql);
+        return $result;
+    }
+}

+ 61 - 0
application/common/model/webuserlogmodel.php

@@ -0,0 +1,61 @@
+<?php
+/*
+ * @Author: wang jun
+ * @Date: 2021-10-29 16:06:41
+ * @Last Modified by: wang jun
+ * @Last Modified time: 2021-11-16 11:25:26
+ */
+namespace app\common\model;
+
+use think\Model;
+
+class webuserlogmodel extends Model
+{
+
+    protected $table = 't_webuserlog';
+
+    public function insertData($data)
+    {
+        $id = $this->insertGetId($data);
+        return empty($id) ? false : $id;
+    }
+
+    public function getInfo($where, $field = "*", $row = true)
+    {
+        $info = $this->field($field)->where($where);
+        if ($row) {
+            $info = $info->find();
+        } else {
+            $info = $info->select();
+        }
+        return empty($info) ? false : $info;
+    }
+
+    public function updateinfo($where, $updateData)
+    {
+        $row = $this->where($where)->update($updateData);
+        return empty($row) ? false : $row;
+    }
+
+    public function deleteinfo($where)
+    {
+        $row = $this->where($where)->delete();
+        return empty($row) ? false : $row;
+    }
+
+    public function getList($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->where($where);
+        if ("count" != $field) {
+            $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj = $sqlObj->count();
+        }
+        return $data;
+    }
+}

+ 102 - 0
application/common/model/webusermodel.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sicilon_IT
+ * Date: 2020/1/22
+ * Time: 21:08
+ */
+namespace app\common\model;
+
+use think\Model;
+
+class webusermodel extends Model
+{
+    protected $table = 't_webuser';
+
+    public function insertData($data)
+    {
+        $id = $this->insertGetId($data);
+        return empty($id) ? false : $id;
+    }
+
+    public function getlogininfo($lname, $lpwd)
+    {
+        $where_arr['user_password'] = $lpwd;
+        $where_arr['user_name'] = $lname;
+        $uinfo = $this->where($where_arr)->find();
+        //var_dump($uinfo);
+        return $uinfo;
+
+    }
+    /***
+     * 用户密码md5登录
+     */
+    public function getlogininfomd5($lname, $lpwd)
+    {
+        $where_arr['user_password'] = md5($lname . $lpwd);
+        $where_arr['user_name'] = $lname;
+        $uinfo = $this->where($where_arr)->find();
+        return $uinfo;
+    }
+    public function getInfo($where, $field = "*", $row = true)
+    {
+        $info = $this->field($field)->where($where);
+        if ($row) {
+            $info = $info->find();
+        } else {
+            $info = $info->select();
+        }
+        return empty($info) ? false : $info;
+    }
+
+    public function updateinfo($where, $updateData)
+    {
+        $row = $this->where($where)->update($updateData);
+        return empty($row) ? false : $row;
+    }
+
+    public function deleteinfo($where)
+    {
+        $row = $this->where($where)->delete();
+        return empty($row) ? false : $row;
+    }
+
+    public function getList($where = [], $field = "*", $page = 1, $size = 10, $order = "id desc", $group = "", $row = false)
+    {
+        $sqlObj = $this->where($where);
+        if ("count" != $field) {
+            $sqlObj = $sqlObj->field($field)->order($order)->group($group)->page($page, $size);
+            if ($row) {
+                $data = $sqlObj->find();
+            } else {
+                $data = $sqlObj->select();
+            }
+        } else {
+            $data = $sqlObj = $sqlObj->count();
+        }
+        return $data;
+    }
+    /**
+     * 根据id获取信息
+     * wj
+     * 20220420
+     */
+    public function getinfobyid($id)
+    {
+        $where = ['id' => $id];
+        $info = $this->where($where)->find();
+        return $info ? $info : false;
+
+    }
+    /**获取多个id通过用户名 */
+    public function getidsbyusername($name, $like = true)
+    {
+        if ($like) {
+            $where = ['user_name' => ['like', '%' . $name . '%']];
+        } else {
+            $where = ['user_name' => $name];
+        }
+        $list = $this->field('id')->where($where)->select();
+        return $list ? $list : false;
+    }
+}