From b0bb19777114558c73b0555974bb351b08fdc62b Mon Sep 17 00:00:00 2001 From: 15090180611 <215509543@qq.com> Date: Thu, 7 Nov 2024 18:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E7=94=A8=E6=88=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=B8=E9=94=80=E6=9D=83=E9=99=90=EF=BC=8C?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=AF=A6=E6=83=85=EF=BC=8C=E6=95=99=E5=B8=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/dyqc/ManystoreShop.php | 71 ++++ .../controller/school/classes/VirtualUser.php | 8 +- .../school/classes/hourorder/Order.php | 4 +- .../admin/lang/zh-cn/dyqc/manystore_shop.php | 34 ++ .../zh-cn/school/classes/hourorder/order.php | 2 + .../school/classes/hourorder/order_log.php | 2 + .../zh-cn/school/classes/virtual_user.php | 6 + .../admin/model/dyqc/ManystoreShop.php | 104 ++++++ .../admin/model/school/classes/Teacher.php | 15 +- .../model/school/classes/VirtualUser.php | 28 +- .../model/school/classes/hourorder/Order.php | 4 +- .../school/classes/hourorder/OrderLog.php | 2 +- .../admin/validate/dyqc/ManystoreShop.php | 27 ++ .../admin/view/dyqc/manystore_shop/add.html | 165 ++++++++ .../admin/view/dyqc/manystore_shop/edit.html | 165 ++++++++ .../admin/view/dyqc/manystore_shop/index.html | 46 +++ .../view/school/classes/classes_lib/add.html | 40 +- .../view/school/classes/classes_lib/edit.html | 42 ++- .../view/school/classes/classes_spec/add.html | 2 +- .../school/classes/classes_spec/edit.html | 2 +- .../view/school/classes/teacher/add.html | 4 +- .../view/school/classes/teacher/edit.html | 4 +- .../view/school/classes/verification/add.html | 6 +- .../school/classes/verification/edit.html | 6 +- .../view/school/classes/virtual_user/add.html | 2 +- .../school/classes/virtual_user/edit.html | 2 +- application/api/controller/Common.php | 32 +- application/api/controller/User.php | 5 + application/api/controller/school/Base.php | 25 ++ application/api/controller/school/Classes.php | 119 ++++++ application/api/controller/school/Order.php | 57 +++ application/api/controller/school/Shop.php | 60 +++ application/api/controller/school/Teacher.php | 57 +++ .../api/controller/school/worker/Base.php | 25 ++ application/common/library/Virtual.php | 66 ++++ application/common/model/User.php | 33 +- .../common/model/dyqc/ManystoreShop.php | 178 +++++++++ .../common/model/school/classes/Cate.php | 59 +++ .../model/school/classes/ClassesLib.php | 353 ++++++++++++++++++ .../model/school/classes/ClassesSpec.php | 87 +++++ .../common/model/school/classes/Collect.php | 60 +++ .../common/model/school/classes/Label.php | 59 +++ .../common/model/school/classes/Lib.php | 12 + .../common/model/school/classes/Order.php | 12 + .../common/model/school/classes/Teacher.php | 95 +++++ .../model/school/classes/Verification.php | 65 ++++ .../model/school/classes/VirtualHead.php | 53 +++ .../model/school/classes/VirtualUser.php | 60 +++ .../model/school/classes/hour/Order.php | 12 + .../model/school/classes/hourorder/Order.php | 140 +++++++ .../school/classes/hourorder/OrderLog.php | 53 +++ .../common/model/school/classes/lib/Spec.php | 12 + .../model/school/classes/order/Detail.php | 12 + .../model/school/classes/order/Order.php | 189 ++++++++++ .../school/classes/order/OrderDetail.php | 99 +++++ .../model/school/classes/order/OrderLog.php | 95 +++++ .../controller/school/classes/VirtualUser.php | 3 +- .../zh-cn/school/classes/hourorder/order.php | 1 + .../school/classes/hourorder/order_log.php | 1 + .../zh-cn/school/classes/virtual_user.php | 6 + application/manystore/model/Admin.php | 12 + .../model/SchoolClassesHourOrder.php | 12 + .../manystore/model/SchoolClassesLib.php | 12 + .../manystore/model/SchoolClassesLibSpec.php | 12 + .../manystore/model/SchoolClassesOrder.php | 12 + .../model/SchoolClassesOrderDetail.php | 12 + application/manystore/model/User.php | 12 + .../model/school/classes/VirtualUser.php | 28 +- .../model/school/classes/hourorder/Order.php | 2 +- .../school/classes/hourorder/OrderLog.php | 2 +- .../view/school/classes/virtual_user/add.html | 24 ++ .../school/classes/virtual_user/edit.html | 24 ++ .../backend/school/classes/hourorder/order.js | 4 +- .../school/classes/hourorder/order_log.js | 2 +- .../js/backend/school/classes/virtual_user.js | 5 +- .../school/classes/hourorder/order.js | 2 +- .../school/classes/hourorder/order_log.js | 2 +- .../manystore/school/classes/virtual_user.js | 4 +- 78 files changed, 3113 insertions(+), 58 deletions(-) create mode 100644 application/admin/controller/dyqc/ManystoreShop.php create mode 100644 application/admin/lang/zh-cn/dyqc/manystore_shop.php create mode 100644 application/admin/model/dyqc/ManystoreShop.php create mode 100644 application/admin/validate/dyqc/ManystoreShop.php create mode 100644 application/admin/view/dyqc/manystore_shop/add.html create mode 100644 application/admin/view/dyqc/manystore_shop/edit.html create mode 100644 application/admin/view/dyqc/manystore_shop/index.html create mode 100644 application/api/controller/school/Base.php create mode 100644 application/api/controller/school/Classes.php create mode 100644 application/api/controller/school/Order.php create mode 100644 application/api/controller/school/Shop.php create mode 100644 application/api/controller/school/Teacher.php create mode 100644 application/api/controller/school/worker/Base.php create mode 100644 application/common/library/Virtual.php create mode 100644 application/common/model/dyqc/ManystoreShop.php create mode 100644 application/common/model/school/classes/Cate.php create mode 100644 application/common/model/school/classes/ClassesLib.php create mode 100644 application/common/model/school/classes/ClassesSpec.php create mode 100644 application/common/model/school/classes/Collect.php create mode 100644 application/common/model/school/classes/Label.php create mode 100644 application/common/model/school/classes/Lib.php create mode 100644 application/common/model/school/classes/Order.php create mode 100644 application/common/model/school/classes/Teacher.php create mode 100644 application/common/model/school/classes/Verification.php create mode 100644 application/common/model/school/classes/VirtualHead.php create mode 100644 application/common/model/school/classes/VirtualUser.php create mode 100644 application/common/model/school/classes/hour/Order.php create mode 100644 application/common/model/school/classes/hourorder/Order.php create mode 100644 application/common/model/school/classes/hourorder/OrderLog.php create mode 100644 application/common/model/school/classes/lib/Spec.php create mode 100644 application/common/model/school/classes/order/Detail.php create mode 100644 application/common/model/school/classes/order/Order.php create mode 100644 application/common/model/school/classes/order/OrderDetail.php create mode 100644 application/common/model/school/classes/order/OrderLog.php create mode 100644 application/manystore/model/Admin.php create mode 100644 application/manystore/model/SchoolClassesHourOrder.php create mode 100644 application/manystore/model/SchoolClassesLib.php create mode 100644 application/manystore/model/SchoolClassesLibSpec.php create mode 100644 application/manystore/model/SchoolClassesOrder.php create mode 100644 application/manystore/model/SchoolClassesOrderDetail.php create mode 100644 application/manystore/model/User.php diff --git a/application/admin/controller/dyqc/ManystoreShop.php b/application/admin/controller/dyqc/ManystoreShop.php new file mode 100644 index 0000000..0795b38 --- /dev/null +++ b/application/admin/controller/dyqc/ManystoreShop.php @@ -0,0 +1,71 @@ +model = new \app\admin\model\dyqc\ManystoreShop; + $this->view->assign("statusList", $this->model->getStatusList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['admin']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + $row->getRelation('admin')->visible(['nickname']); + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + +} diff --git a/application/admin/controller/school/classes/VirtualUser.php b/application/admin/controller/school/classes/VirtualUser.php index e99bd8f..a35ccc2 100644 --- a/application/admin/controller/school/classes/VirtualUser.php +++ b/application/admin/controller/school/classes/VirtualUser.php @@ -22,7 +22,8 @@ class VirtualUser extends Backend { parent::_initialize(); $this->model = new \app\admin\model\school\classes\VirtualUser; - + $this->view->assign("jointypeList", $this->model->getJointypeList()); + $this->view->assign("havetypeList", $this->model->getHavetypeList()); } @@ -57,8 +58,9 @@ class VirtualUser extends Backend ->paginate($limit); foreach ($list as $row) { - - $row->getRelation('lib')->visible(['title','headimage']); +// $row->visible(['id','classes_lib_id']); +// $row->visible(['lib']); + $row->getRelation('lib')->visible(['title','headimage']); } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/admin/controller/school/classes/hourorder/Order.php b/application/admin/controller/school/classes/hourorder/Order.php index b705ab9..2b6f4a2 100644 --- a/application/admin/controller/school/classes/hourorder/Order.php +++ b/application/admin/controller/school/classes/hourorder/Order.php @@ -51,14 +51,14 @@ class Order extends Backend list($where, $sort, $order, $offset, $limit) = $this->buildparams(); $list = $this->model - ->with(['order','spec','user','detail','lib']) + ->with(['classesorder','spec','user','detail','lib']) ->where($where) ->order($sort, $order) ->paginate($limit); foreach ($list as $row) { - $row->getRelation('order')->visible(['order_no']); + $row->getRelation('classesorder')->visible(['order_no']); $row->getRelation('spec')->visible(['name']); $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']); $row->getRelation('detail')->visible(['title','headimage']); diff --git a/application/admin/lang/zh-cn/dyqc/manystore_shop.php b/application/admin/lang/zh-cn/dyqc/manystore_shop.php new file mode 100644 index 0000000..35d9aba --- /dev/null +++ b/application/admin/lang/zh-cn/dyqc/manystore_shop.php @@ -0,0 +1,34 @@ + 'ID', + 'Name' => '店铺名称', + 'Logo' => '品牌LOGO', + 'Image' => '封面图', + 'Images' => '店铺环境照片', + 'Address_city' => '城市选择', + 'Province' => '省编号', + 'City' => '市编号', + 'District' => '县区编号', + 'Address' => '店铺地址', + 'Address_detail' => '店铺详细地址', + 'Longitude' => '经度', + 'Latitude' => '纬度', + 'Yyzzdm' => '营业执照', + 'Yyzz_images' => '营业执照照片', + 'Tel' => '服务电话', + 'Content' => '店铺详情', + 'Status' => '审核状态', + 'Status 0' => '待审核', + 'Set status to 0'=> '设为待审核', + 'Status 1' => '审核通过', + 'Set status to 1'=> '设为审核通过', + 'Status 2' => '审核失败', + 'Set status to 2'=> '设为审核失败', + 'Reason' => '审核不通过原因', + 'Auth_time' => '审核时间', + 'Admin_id' => '审核管理员id', + 'Create_time' => '创建时间', + 'Update_time' => '修改时间', + 'Admin.nickname' => '昵称' +]; diff --git a/application/admin/lang/zh-cn/school/classes/hourorder/order.php b/application/admin/lang/zh-cn/school/classes/hourorder/order.php index d005421..3432102 100644 --- a/application/admin/lang/zh-cn/school/classes/hourorder/order.php +++ b/application/admin/lang/zh-cn/school/classes/hourorder/order.php @@ -16,6 +16,8 @@ return [ 'Status' => '订单状态', 'Status -3' => '已取消', 'Set status to -3' => '设为已取消', + 'Status -1' => '已报名待审核', + 'Set status to -1' => '设为已报名待审核', 'Status 0' => '已预约', 'Set status to 0' => '设为已预约', 'Status 3' => '已完成', diff --git a/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php b/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php index 6ba3615..8ad69ca 100644 --- a/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php +++ b/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php @@ -5,6 +5,8 @@ return [ 'Status' => '订单状态', 'Status -3' => '已取消', 'Set status to -3' => '设为已取消', + 'Status -1' => '已报名待审核', + 'Set status to -1' => '设为已报名待审核', 'Status 0' => '已预约', 'Set status to 0' => '设为已预约', 'Status 3' => '已完成', diff --git a/application/admin/lang/zh-cn/school/classes/virtual_user.php b/application/admin/lang/zh-cn/school/classes/virtual_user.php index 1c87a80..8461481 100644 --- a/application/admin/lang/zh-cn/school/classes/virtual_user.php +++ b/application/admin/lang/zh-cn/school/classes/virtual_user.php @@ -5,6 +5,12 @@ return [ 'Head_image' => '头像', 'Classes_lib_id' => '课程id', 'Time' => '虚拟下单时间', + 'Jointype' => '参与中', + 'Jointype 1' => '是', + 'Jointype 0' => '否', + 'Havetype' => '已报名', + 'Havetype 1' => '是', + 'Havetype 0' => '否', 'Lib.title' => '标题', 'Lib.headimage' => '头图' ]; diff --git a/application/admin/model/dyqc/ManystoreShop.php b/application/admin/model/dyqc/ManystoreShop.php new file mode 100644 index 0000000..3213277 --- /dev/null +++ b/application/admin/model/dyqc/ManystoreShop.php @@ -0,0 +1,104 @@ + __('Status 0'), '1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAuthTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['auth_time']) ? $data['auth_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getCreateTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['create_time']) ? $data['create_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getUpdateTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + protected function setAuthTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setCreateTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setUpdateTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/admin/model/school/classes/Teacher.php b/application/admin/model/school/classes/Teacher.php index fe3d566..8873287 100644 --- a/application/admin/model/school/classes/Teacher.php +++ b/application/admin/model/school/classes/Teacher.php @@ -27,7 +27,20 @@ class Teacher extends Model protected $append = [ 'status_text' ]; - + + + public function getHeadImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + public function getExpertImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + protected static function init() { diff --git a/application/admin/model/school/classes/VirtualUser.php b/application/admin/model/school/classes/VirtualUser.php index bc167f1..4b4d75f 100644 --- a/application/admin/model/school/classes/VirtualUser.php +++ b/application/admin/model/school/classes/VirtualUser.php @@ -25,12 +25,22 @@ class VirtualUser extends Model // 追加属性 protected $append = [ - 'time_text' + 'time_text', + 'jointype_text', + 'havetype_text' ]; + public function getJointypeList() + { + return ['1' => __('Jointype 1'), '0' => __('Jointype 0')]; + } + public function getHavetypeList() + { + return ['1' => __('Havetype 1'), '0' => __('Havetype 0')]; + } public function getTimeTextAttr($value, $data) @@ -39,6 +49,22 @@ class VirtualUser extends Model return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; } + + public function getJointypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['jointype']) ? $data['jointype'] : ''); + $list = $this->getJointypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getHavetypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['havetype']) ? $data['havetype'] : ''); + $list = $this->getHavetypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + protected function setTimeAttr($value) { return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); diff --git a/application/admin/model/school/classes/hourorder/Order.php b/application/admin/model/school/classes/hourorder/Order.php index 8e5cbce..5fa1483 100644 --- a/application/admin/model/school/classes/hourorder/Order.php +++ b/application/admin/model/school/classes/hourorder/Order.php @@ -37,7 +37,7 @@ class Order extends Model public function getStatusList() { - return ['-3' => __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3')]; + return ['-3' => __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; } @@ -109,7 +109,7 @@ class Order extends Model } - public function order() + public function classesorder() { return $this->belongsTo('app\admin\model\school\classes\Order', 'classes_order_id', 'id', [], 'LEFT')->setEagerlyType(0); } diff --git a/application/admin/model/school/classes/hourorder/OrderLog.php b/application/admin/model/school/classes/hourorder/OrderLog.php index da7afa2..422394c 100644 --- a/application/admin/model/school/classes/hourorder/OrderLog.php +++ b/application/admin/model/school/classes/hourorder/OrderLog.php @@ -32,7 +32,7 @@ class OrderLog extends Model public function getStatusList() { - return ['-3' => __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3')]; + return ['-3' => __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; } diff --git a/application/admin/validate/dyqc/ManystoreShop.php b/application/admin/validate/dyqc/ManystoreShop.php new file mode 100644 index 0000000..5f60c6b --- /dev/null +++ b/application/admin/validate/dyqc/ManystoreShop.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/dyqc/manystore_shop/add.html b/application/admin/view/dyqc/manystore_shop/add.html new file mode 100644 index 0000000..6fad076 --- /dev/null +++ b/application/admin/view/dyqc/manystore_shop/add.html @@ -0,0 +1,165 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ + +
+ +
+
    +
    +
    +
    + +
    +
    + +
    + + +
    + +
    +
      +
      +
      +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      +
      + +
      + + +
      + +
      +
        +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        + {foreach name="statusList" item="vo"} + + {/foreach} +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        diff --git a/application/admin/view/dyqc/manystore_shop/edit.html b/application/admin/view/dyqc/manystore_shop/edit.html new file mode 100644 index 0000000..9887622 --- /dev/null +++ b/application/admin/view/dyqc/manystore_shop/edit.html @@ -0,0 +1,165 @@ +
        + +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        +
        + +
        + + +
        + +
        +
          +
          +
          +
          + +
          +
          + +
          + + +
          + +
          +
            +
            +
            +
            + +
            +
            +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            +
            + +
            + + +
            + +
            +
              +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              + {foreach name="statusList" item="vo"} + + {/foreach} +
              + +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              +
              +
              + +
              + +
              +
              +
              diff --git a/application/admin/view/dyqc/manystore_shop/index.html b/application/admin/view/dyqc/manystore_shop/index.html new file mode 100644 index 0000000..68d5cdf --- /dev/null +++ b/application/admin/view/dyqc/manystore_shop/index.html @@ -0,0 +1,46 @@ +
              + +
              + {:build_heading(null,FALSE)} + +
              + + +
              +
              +
              +
              +
              + + {:__('Add')} + {:__('Edit')} + {:__('Delete')} + + +
              + {:__('More')} + +
              + + +
              + +
              +
              +
              + +
              +
              +
              diff --git a/application/admin/view/school/classes/classes_lib/add.html b/application/admin/view/school/classes/classes_lib/add.html index 839759e..a164db6 100644 --- a/application/admin/view/school/classes/classes_lib/add.html +++ b/application/admin/view/school/classes/classes_lib/add.html @@ -3,13 +3,13 @@
              - +
              - +
              @@ -18,16 +18,23 @@
              +
              + +
              + +
              +
              +
              - +
              - +
              @@ -48,12 +55,12 @@
              -
              - -
              - -
              -
              + + + + + +
              @@ -196,6 +203,19 @@
              + + + + + + + + + + + + +
              diff --git a/application/admin/view/school/classes/classes_lib/edit.html b/application/admin/view/school/classes/classes_lib/edit.html index 6130526..7857c04 100644 --- a/application/admin/view/school/classes/classes_lib/edit.html +++ b/application/admin/view/school/classes/classes_lib/edit.html @@ -3,13 +3,13 @@
              - +
              - +
              @@ -18,16 +18,24 @@
              + +
              + +
              + +
              +
              +
              - +
              - +
              @@ -48,12 +56,12 @@
              -
              - -
              - -
              -
              + + + + + +
              @@ -220,6 +228,16 @@
              + +
              + +
              + +
              +
              + + +
              @@ -310,6 +328,10 @@
              + + + +
              diff --git a/application/admin/view/school/classes/classes_spec/add.html b/application/admin/view/school/classes/classes_spec/add.html index b45fa91..7bd1198 100644 --- a/application/admin/view/school/classes/classes_spec/add.html +++ b/application/admin/view/school/classes/classes_spec/add.html @@ -3,7 +3,7 @@
              - +
              diff --git a/application/admin/view/school/classes/classes_spec/edit.html b/application/admin/view/school/classes/classes_spec/edit.html index 08fa766..010c27a 100644 --- a/application/admin/view/school/classes/classes_spec/edit.html +++ b/application/admin/view/school/classes/classes_spec/edit.html @@ -3,7 +3,7 @@
              - +
              diff --git a/application/admin/view/school/classes/teacher/add.html b/application/admin/view/school/classes/teacher/add.html index 41508d2..3c41870 100644 --- a/application/admin/view/school/classes/teacher/add.html +++ b/application/admin/view/school/classes/teacher/add.html @@ -3,13 +3,13 @@
              - +
              - +
              diff --git a/application/admin/view/school/classes/teacher/edit.html b/application/admin/view/school/classes/teacher/edit.html index 7892ae5..f528fa6 100644 --- a/application/admin/view/school/classes/teacher/edit.html +++ b/application/admin/view/school/classes/teacher/edit.html @@ -3,13 +3,13 @@
              - +
              - +
              diff --git a/application/admin/view/school/classes/verification/add.html b/application/admin/view/school/classes/verification/add.html index aa2f6dd..84c52c7 100644 --- a/application/admin/view/school/classes/verification/add.html +++ b/application/admin/view/school/classes/verification/add.html @@ -3,13 +3,13 @@
              - +
              - +
              @@ -21,7 +21,7 @@
              - +
              diff --git a/application/admin/view/school/classes/verification/edit.html b/application/admin/view/school/classes/verification/edit.html index f86075e..4b07d6a 100644 --- a/application/admin/view/school/classes/verification/edit.html +++ b/application/admin/view/school/classes/verification/edit.html @@ -3,13 +3,13 @@
              - +
              - +
              @@ -21,7 +21,7 @@
              - +
              diff --git a/application/admin/view/school/classes/virtual_user/add.html b/application/admin/view/school/classes/virtual_user/add.html index 03025ec..1b2618a 100644 --- a/application/admin/view/school/classes/virtual_user/add.html +++ b/application/admin/view/school/classes/virtual_user/add.html @@ -23,7 +23,7 @@
              - +
              diff --git a/application/admin/view/school/classes/virtual_user/edit.html b/application/admin/view/school/classes/virtual_user/edit.html index 45f816a..a9411fc 100644 --- a/application/admin/view/school/classes/virtual_user/edit.html +++ b/application/admin/view/school/classes/virtual_user/edit.html @@ -23,7 +23,7 @@
              - +
              diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 4113a7d..dcac0bf 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -2,9 +2,11 @@ namespace app\api\controller; +use app\admin\model\school\classes\VirtualHead; use app\common\controller\Api; use app\common\exception\UploadException; use app\common\library\Upload; +use app\common\library\Virtual; use app\common\model\Area; use app\common\model\Version; use fast\Random; @@ -17,7 +19,7 @@ use think\Hook; */ class Common extends Api { - protected $noNeedLogin = ['init', 'captcha']; + protected $noNeedLogin = ['init', 'captcha','virtualgenerate']; protected $noNeedRight = '*'; public function _initialize() @@ -162,5 +164,33 @@ class Common extends Api ]); $captcha = new Captcha((array)Config::get('captcha')); return $captcha->entry($id); + + + + } + + + /** + * @ApiTitle(生成随机昵称和头像) + * @ApiSummary(生成随机昵称和头像) + * @ApiRoute(/api/common/virtualgenerate) + * @ApiMethod(GET) + * @ApiParams(name = "number", type = "int",required=true,description = "生成数量") + * @ApiReturn({ unpaid_user_data 参与中 paid_user_data 已报名 }) + */ + public function virtualgenerate(){ + $number = $this->request->get('number/d',''); + if(empty($number)){ + $this->error(__('缺少必要参数')); + } + try { + $res = (new Virtual)->getVirtualUser($number); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('生成成功', $res); + } + } diff --git a/application/api/controller/User.php b/application/api/controller/User.php index d379570..70bc9d9 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -156,10 +156,15 @@ class User extends Api */ public function index() { + $data = [ 'welcome' => $this->auth->nickname, 'user_info'=>$this->auth->getUserinfo() ]; + //是否有核销按钮展示权 + $data['have_auth'] = \app\common\model\User::verificationAuth($this->auth->id); + $data['have_teacher'] = \app\common\model\User::teacherAuth($this->auth->id); + $data['user_info']["avatar"] = $data['user_info']["avatar"]? cdnurl($data['user_info']["avatar"],true):$data['user_info']["avatar"]; $this->success('调用成功',$data); } diff --git a/application/api/controller/school/Base.php b/application/api/controller/school/Base.php new file mode 100644 index 0000000..ebbe62e --- /dev/null +++ b/application/api/controller/school/Base.php @@ -0,0 +1,25 @@ +model = new ClassesLib; + parent::_initialize(); + + //判断登录用户是否是员工 + } + + public function index() + { + } + + + + /** + * @ApiTitle(课程详情接口) + * @ApiSummary(课程详情接口) + * @ApiRoute(/api/school/classes/detail) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "课程id") + * @ApiReturn({ + + * + *}) + */ + public function detail(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->detail($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['detail' => $res]); + } + + + + + + /** + * @ApiTitle(课程参与者和报名者) + * @ApiSummary(课程参与者和报名者) + * @ApiRoute(/api/school/classes/people) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "课程id") + * @ApiReturn({ unpaid_user_data 参与中 paid_user_data 已报名 }) + */ + public function people(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->virtualParticipants($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', $res); + } + + + /** + * @ApiTitle(课程课时规格) + * @ApiSummary(课程课时规格) + * @ApiRoute(/api/school/classes/spec) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "课程id") + * @ApiReturn({ spec 课时规格 }) + */ + public function spec(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->spec($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['spec'=>$res]); + } + + +} \ No newline at end of file diff --git a/application/api/controller/school/Order.php b/application/api/controller/school/Order.php new file mode 100644 index 0000000..8669a35 --- /dev/null +++ b/application/api/controller/school/Order.php @@ -0,0 +1,57 @@ +model = new Teachermodel; + parent::_initialize(); + + //判断登录用户是否是员工 + } + + + /** + * @ApiTitle( x详情) + * @ApiSummary(xx详情) + * @ApiRoute(/api/school/teacher/detail) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "老师id") + * @ApiReturn({ + * + *}) + */ + public function detail(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->detail($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['detail' => $res]); + } +} + diff --git a/application/api/controller/school/Shop.php b/application/api/controller/school/Shop.php new file mode 100644 index 0000000..681190a --- /dev/null +++ b/application/api/controller/school/Shop.php @@ -0,0 +1,60 @@ +model = new ManystoreShop; + parent::_initialize(); + + //判断登录用户是否是员工 + } + + + /** + * @ApiTitle( 机构详情) + * @ApiSummary(机构详情) + * @ApiRoute(/api/school/shop/detail) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "机构id") + * @ApiReturn({ + + * + *}) + */ + public function detail(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->detail($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['detail' => $res]); + } + + + +} \ No newline at end of file diff --git a/application/api/controller/school/Teacher.php b/application/api/controller/school/Teacher.php new file mode 100644 index 0000000..e707493 --- /dev/null +++ b/application/api/controller/school/Teacher.php @@ -0,0 +1,57 @@ +model = new Teachermodel; + parent::_initialize(); + + //判断登录用户是否是员工 + } + + + /** + * @ApiTitle( 老师详情) + * @ApiSummary(老师详情) + * @ApiRoute(/api/school/teacher/detail) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "老师id") + * @ApiReturn({ + * + *}) + */ + public function detail(){ + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->detail($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['detail' => $res]); + } +} + diff --git a/application/api/controller/school/worker/Base.php b/application/api/controller/school/worker/Base.php new file mode 100644 index 0000000..c4a626e --- /dev/null +++ b/application/api/controller/school/worker/Base.php @@ -0,0 +1,25 @@ +limit($num)->select(); + //随机获得$num个虚拟用户昵称和头像 + foreach($virtualHead as $v) { + $nickname = $this->getNickName(); + $head = $v->head_image; + $r = rand(($time - 86400*7),$time); + + $users[] = [ + "nickname"=>$nickname, + "head_image"=>$head, + "time"=>$r, + "jointype" => "1", + "havetype" => "".($r % 2) + ]; + } + + if(!$set){ + return $users; + }else{ + + $user_data=[]; + foreach($users as $user) { + $r = rand(($time - 86400*7),$time); + $user_data[] = [ + "nickname"=>$user["nickname"], + "head_image"=>$user["head_image"], + "classes_lib_id"=>$classes_lib_id, + "time"=>$r, + "jointype" => "1", + "havetype" => "".($r % 2) + ]; + } + (new VirtualUser)->saveAll($user_data); + return $user_data; + } + } + + +} \ No newline at end of file diff --git a/application/common/model/User.php b/application/common/model/User.php index 097ed4a..59394d0 100644 --- a/application/common/model/User.php +++ b/application/common/model/User.php @@ -2,6 +2,8 @@ namespace app\common\model; +use app\common\model\school\classes\Teacher; +use app\common\model\school\classes\Verification; use think\Db; use think\Model; @@ -45,7 +47,7 @@ class User extends Model //$value = '/assets/img/avatar.png'; $value = letter_avatar($data['nickname']); } - return $value; + return cdnurl($value,true); } /** @@ -148,4 +150,33 @@ class User extends Model } return $level; } + + + /**是否有核销权限 + * @return boolean + */ + public static function verificationAuth($user_id){ + $have_auth = false; + //判断用户是否有核销权限 + //判断是否是员工 + $verification = Verification::where("user_id",$user_id)->where("status",'1')->find(); + if($verification)$have_auth = true; + //判断是否是教师 + $teacher = Teacher::where("user_id",$user_id)->find(); + if($teacher)$have_auth = true; + return $have_auth; + } + + /**是否有老师权限 + * @return boolean + */ + public static function teacherAuth($user_id){ + $have_auth = false; + //判断是否是教师 + $teacher = Teacher::where("user_id",$user_id)->find(); + if($teacher)$have_auth = true; + return $have_auth; + } + + } diff --git a/application/common/model/dyqc/ManystoreShop.php b/application/common/model/dyqc/ManystoreShop.php new file mode 100644 index 0000000..8ef3b59 --- /dev/null +++ b/application/common/model/dyqc/ManystoreShop.php @@ -0,0 +1,178 @@ +hasMany(Teacher::class,'shop_id')->where("status","1")->order("weigh desc"); + } + + + + + + + + public function getLogoAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + public function getImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + public function getImagesAttr($value, $data) + { + $imagesArray = []; + if (!empty($value)) { + $imagesArray = explode(',', $value); + foreach ($imagesArray as &$v) { + $v = cdnurl($v, true); + } + return $imagesArray; + } + return $imagesArray; + } + + + public function getYyzzImagesAttr($value, $data) + { + $imagesArray = []; + if (!empty($value)) { + $imagesArray = explode(',', $value); + foreach ($imagesArray as &$v) { + $v = cdnurl($v, true); + } + return $imagesArray; + } + return $imagesArray; + } + + + + + + + public function getStatusList() + { + return ['0' => __('Status 0'), '1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAuthTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['auth_time']) ? $data['auth_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getCreateTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['create_time']) ? $data['create_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getUpdateTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + protected function setAuthTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setCreateTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setUpdateTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + + + /** 机构详情 + * @param $id + * @throws \think\exception\DbException + */ + public function detail($id){ + $self = $this->get($id,['teachers']); + //一对多隐藏字段方法 +// foreach ($self['teachers'] as $k=>$v){ +// $v->visible(['id','name','expert_image','expert_content']); +// } +// $self->visible(['id','name','expert_image','expert_content']); + $self["hot"] = $this->getHotClasses($id,$limit=5); + return $self; + } + + + public function getHotClasses($id,$limit=5){ + $data = ClassesLib::where("shop_id",$id) + ->where("status",'1') + ->limit($limit) + ->order("hot desc,weigh desc") + ->field("title,headimage,price,hot,weigh") + ->select(); + return $data; + } + +} diff --git a/application/common/model/school/classes/Cate.php b/application/common/model/school/classes/Cate.php new file mode 100644 index 0000000..fa37d34 --- /dev/null +++ b/application/common/model/school/classes/Cate.php @@ -0,0 +1,59 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + +} diff --git a/application/common/model/school/classes/ClassesLib.php b/application/common/model/school/classes/ClassesLib.php new file mode 100644 index 0000000..0f12520 --- /dev/null +++ b/application/common/model/school/classes/ClassesLib.php @@ -0,0 +1,353 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getAddTypeList() + { + return ['1' => __('Add_type 1'), '2' => __('Add_type 2')]; + } + + public function getTypeList() + { + return ['out' => __('Type out'), 'in' => __('Type in')]; + } + + public function getAddressTypeList() + { + return ['1' => __('Address_type 1'), '2' => __('Address_type 2')]; + } + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3')]; + } + + public function getAuthStatusList() + { + return ['0' => __('Auth_status 0'), '1' => __('Auth_status 1'), '2' => __('Auth_status 2')]; + } + + public function getRecommendList() + { + return ['0' => __('Recommend 0'), '1' => __('Recommend 1')]; + } + + public function getHotList() + { + return ['0' => __('Hot 0'), '1' => __('Hot 1')]; + } + + public function getNewList() + { + return ['0' => __('New 0'), '1' => __('New 1')]; + } + + public function getSelfhotList() + { + return ['0' => __('Selfhot 0'), '1' => __('Selfhot 1')]; + } + + + public function getAddTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['add_type']) ? $data['add_type'] : ''); + $list = $this->getAddTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['type']) ? $data['type'] : ''); + $list = $this->getTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAddressTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['address_type']) ? $data['address_type'] : ''); + $list = $this->getAddressTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAuthStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['auth_status']) ? $data['auth_status'] : ''); + $list = $this->getAuthStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAuthTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['auth_time']) ? $data['auth_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getRecommendTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['recommend']) ? $data['recommend'] : ''); + $list = $this->getRecommendList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getHotTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['hot']) ? $data['hot'] : ''); + $list = $this->getHotList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getNewTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['new']) ? $data['new'] : ''); + $list = $this->getNewList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getSelfhotTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['selfhot']) ? $data['selfhot'] : ''); + $list = $this->getSelfhotList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + protected function setAuthTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + + public function getHeadimageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + public function getImagesAttr($value, $data) + { + $imagesArray = []; + if (!empty($value)) { + $imagesArray = explode(',', $value); + foreach ($imagesArray as &$v) { + $v = cdnurl($v, true); + } + return $imagesArray; + } + return $imagesArray; + } + + + + public function manystore() + { + return $this->belongsTo('app\admin\model\Manystore', 'manystore_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function shop() + { + return $this->belongsTo(ManystoreShop::class, 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function user() + { + return $this->belongsTo('app\common\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function teacher() + { + return $this->belongsTo('app\common\model\school\classes\Teacher', 'teacher_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + + + + /** 课程详情 + * @param $id + * @return ClassesLib|null + * @throws \think\exception\DbException + */ + public function detail($id){ + $self = $this->get($id,['shop','teacher']); + //下架判断 + if($self['status'] != '1'){ + $this->error("该课程已下架"); + } + + //参与人数 = 虚拟人数 + 平台人数 + return $self; + } + + + /**课程参与人员信息 + * @param $id + * + */ + public function virtualParticipants($id){ + //虚拟用户生成数量 + $v_num = 10; + $unpaid_user_data = $paid_user_data = []; + //参与者头像 + //先从订单里取出最新的10个未支付和使用中的用户，不足的用虚拟用户填充 + $user_ids = \app\common\model\school\classes\order\Order::where("classes_lib_id",$id)->where("status","in",["0",'3'])->order("createtime desc")->limit($v_num)->column("createtime","user_id"); + if($user_ids){ + $users = User::where("id","in",array_keys($user_ids))->select(); + foreach ($users as $user){ + $unpaid_user_data[] = [ + "nickname"=>$user['nickname'], + "head_image"=>$user['avatar'], + "classes_lib_id"=>$id, + "time"=>$user_ids[$user['id']], + "jointype"=>'1', + "havetype"=>'0' + ]; + } + } + //计算需要生成的虚拟用户数量 + $v_num = $v_num - count($user_ids); + if($v_num<0)$v_num =0; + if($v_num){ + $unpaid_user = VirtualUser::where("classes_lib_id",$id)->where("jointype",'1')->order("time desc")->limit($v_num)->select(); + $unpaid_user_data = array_merge($unpaid_user_data,$unpaid_user); + } + + + + + + //再从订单里取出最新的10个使用中，已完成 和 已退款 的用户，不足的用虚拟用户填充 + $user_ids = \app\common\model\school\classes\order\Order::where("classes_lib_id",$id)->where("status","in",["3",'6','9'])->order("createtime desc")->limit($v_num)->column("createtime","user_id"); + if($user_ids){ + $users = User::where("id","in",array_keys($user_ids))->select(); + foreach ($users as $user){ + $paid_user_data[] = [ + "nickname"=>$user['nickname'], + "head_image"=>$user['avatar'], + "classes_lib_id"=>$id, + "time"=>$user_ids[$user['id']], + "jointype"=>'0', + "havetype"=>'1' + ]; + } + } + //计算需要生成的虚拟用户数量 + $v_num = 10; + $v_num = $v_num - count($user_ids); + if($v_num<0)$v_num =0; + if($v_num){ + $unpaid_user = VirtualUser::where("classes_lib_id",$id)->where("havetype",'1')->order("time desc")->limit($v_num)->select(); + $paid_user_data = array_merge($paid_user_data,$unpaid_user); + } + + //进行昵称加*和按时间重新排序 + array_multisort(array_column($unpaid_user_data, 'time'), SORT_ASC, $unpaid_user_data); + array_multisort(array_column($paid_user_data, 'time'), SORT_ASC, $paid_user_data); + foreach ($unpaid_user_data as &$userss){ + //substr_replace($username, '****', 3, 4); + $userss["nickname"] = $this->nickname_filter($userss["nickname"]); + } + + foreach ($paid_user_data as &$usersss){ + //substr_replace($username, '****', 3, 4); + $usersss["nickname"] = $this->nickname_filter($usersss["nickname"]); + } + + + return compact("unpaid_user_data","paid_user_data"); + } + + public function nickname_filter($nickname){ + $nickname_len = mb_strlen($nickname); + if($nickname_len<=2){ + return $nickname; + }else{ + return mb_substr($nickname,0,1).str_repeat("*",$nickname_len-2).mb_substr($nickname,-1); + } + } + + + /**课程规格 + * @param $id + * + */ + public function spec($id){ + //课程规格 + $spec_data = ClassesSpec::where("classes_lib_id",$id)->where("status",'1')->order("weigh desc")->select(); + + return $spec_data; + } + +} diff --git a/application/common/model/school/classes/ClassesSpec.php b/application/common/model/school/classes/ClassesSpec.php new file mode 100644 index 0000000..38dfd31 --- /dev/null +++ b/application/common/model/school/classes/ClassesSpec.php @@ -0,0 +1,87 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStartTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['start_time']) ? $data['start_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getEndTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['end_time']) ? $data['end_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + protected function setStartTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setEndTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + public function lib() + { + return $this->belongsTo('Lib', 'classes_lib_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/Collect.php b/application/common/model/school/classes/Collect.php new file mode 100644 index 0000000..ff8035e --- /dev/null +++ b/application/common/model/school/classes/Collect.php @@ -0,0 +1,60 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + + + + + + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function lib() + { + return $this->belongsTo('Lib', 'classes_lib_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/Label.php b/application/common/model/school/classes/Label.php new file mode 100644 index 0000000..b41857e --- /dev/null +++ b/application/common/model/school/classes/Label.php @@ -0,0 +1,59 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + +} diff --git a/application/common/model/school/classes/Lib.php b/application/common/model/school/classes/Lib.php new file mode 100644 index 0000000..a4580e8 --- /dev/null +++ b/application/common/model/school/classes/Lib.php @@ -0,0 +1,12 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getHeadImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + public function getExpertImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function manystore() + { + return $this->belongsTo('app\admin\model\Manystore', 'manystore_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function shop() + { + return $this->belongsTo('app\admin\model\manystore\Shop', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function detail($id){ + $self = $this->get($id,["shop"]); + $self["shop"]->visible(['name']); + return $self; + } + + + +} diff --git a/application/common/model/school/classes/Verification.php b/application/common/model/school/classes/Verification.php new file mode 100644 index 0000000..a834653 --- /dev/null +++ b/application/common/model/school/classes/Verification.php @@ -0,0 +1,65 @@ + __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function manystore() + { + return $this->belongsTo('app\admin\model\Manystore', 'manystore_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function shop() + { + return $this->belongsTo('app\admin\model\manystore\Shop', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/VirtualHead.php b/application/common/model/school/classes/VirtualHead.php new file mode 100644 index 0000000..9ad4c2c --- /dev/null +++ b/application/common/model/school/classes/VirtualHead.php @@ -0,0 +1,53 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + + public function getHeadImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + + + + +} diff --git a/application/common/model/school/classes/VirtualUser.php b/application/common/model/school/classes/VirtualUser.php new file mode 100644 index 0000000..8b13a76 --- /dev/null +++ b/application/common/model/school/classes/VirtualUser.php @@ -0,0 +1,60 @@ +belongsTo('Lib', 'classes_lib_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function getHeadImageAttr($value, $data) + { + if (!empty($value)) return cdnurl($value, true); + } + + +} diff --git a/application/common/model/school/classes/hour/Order.php b/application/common/model/school/classes/hour/Order.php new file mode 100644 index 0000000..df21b9b --- /dev/null +++ b/application/common/model/school/classes/hour/Order.php @@ -0,0 +1,12 @@ + __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; + } + + + public function getStartTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['start_time']) ? $data['start_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getEndTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['end_time']) ? $data['end_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getReservationTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['reservation_time']) ? $data['reservation_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getFinishTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['finish_time']) ? $data['finish_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getCancelTimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['cancel_time']) ? $data['cancel_time'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + protected function setStartTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setEndTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setReservationTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setFinishTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setCancelTimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + public function classesorder() + { + return $this->belongsTo('app\admin\model\school\classes\Order', 'classes_order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function spec() + { + return $this->belongsTo('app\admin\model\school\classes\lib\Spec', 'classes_lib_spec_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function detail() + { + return $this->belongsTo('app\admin\model\school\classes\order\Detail', 'classes_order_detail_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function lib() + { + return $this->belongsTo('app\admin\model\school\classes\Lib', 'classes_lib_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/hourorder/OrderLog.php b/application/common/model/school/classes/hourorder/OrderLog.php new file mode 100644 index 0000000..1703324 --- /dev/null +++ b/application/common/model/school/classes/hourorder/OrderLog.php @@ -0,0 +1,53 @@ + __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function order() + { + return $this->belongsTo('app\admin\model\school\classes\hour\Order', 'classes_hour_order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/lib/Spec.php b/application/common/model/school/classes/lib/Spec.php new file mode 100644 index 0000000..437aa9a --- /dev/null +++ b/application/common/model/school/classes/lib/Spec.php @@ -0,0 +1,12 @@ + __('Pay_type yue'), 'wechat' => __('Pay_type wechat')]; + } + + public function getStatusList() + { + return ['-3' => __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3'), '6' => __('Status 6'), '9' => __('Status 9')]; + } + + public function getBeforeStatusList() + { + return ['-3' => __('Before_status -3'), '0' => __('Before_status 0'), '3' => __('Before_status 3'), '6' => __('Before_status 6'), '9' => __('Before_status 9')]; + } + + public function getServerStatusList() + { + return ['0' => __('Server_status 0'), '3' => __('Server_status 3'), '6' => __('Server_status 6')]; + } + + public function getResultStatusList() + { + return ['0' => __('Result_status 0'), '3' => __('Result_status 3'), '6' => __('Result_status 6')]; + } + + + public function getPayTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['pay_type']) ? $data['pay_type'] : ''); + $list = $this->getPayTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getBeforeStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['before_status']) ? $data['before_status'] : ''); + $list = $this->getBeforeStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getServerStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['server_status']) ? $data['server_status'] : ''); + $list = $this->getServerStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getResultStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['result_status']) ? $data['result_status'] : ''); + $list = $this->getResultStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getCanceltimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['canceltime']) ? $data['canceltime'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getPaytimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['paytime']) ? $data['paytime'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getFinishtimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['finishtime']) ? $data['finishtime'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + + public function getRefundtimeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['refundtime']) ? $data['refundtime'] : ''); + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } + + protected function setCanceltimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setPaytimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setFinishtimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + protected function setRefundtimeAttr($value) + { + return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); + } + + + public function manystore() + { + return $this->belongsTo('app\admin\model\Manystore', 'manystore_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function shop() + { + return $this->belongsTo('app\admin\model\manystore\Shop', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function lib() + { + return $this->belongsTo('app\admin\model\school\classes\Lib', 'classes_lib_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function detail() + { + return $this->belongsTo('Detail', 'classes_order_detail_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/order/OrderDetail.php b/application/common/model/school/classes/order/OrderDetail.php new file mode 100644 index 0000000..d2e33a9 --- /dev/null +++ b/application/common/model/school/classes/order/OrderDetail.php @@ -0,0 +1,99 @@ + __('Add_type 1'), '2' => __('Add_type 2')]; + } + + public function getTypeList() + { + return ['out' => __('Type out'), 'in' => __('Type in')]; + } + + public function getAddressTypeList() + { + return ['1' => __('Address_type 1'), '2' => __('Address_type 2')]; + } + + + public function getAddTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['add_type']) ? $data['add_type'] : ''); + $list = $this->getAddTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['type']) ? $data['type'] : ''); + $list = $this->getTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getAddressTypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['address_type']) ? $data['address_type'] : ''); + $list = $this->getAddressTypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function order() + { + return $this->belongsTo('app\admin\model\school\classes\Order', 'classes_order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function manystore() + { + return $this->belongsTo('app\admin\model\Manystore', 'manystore_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function shop() + { + return $this->belongsTo('app\admin\model\manystore\Shop', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + + public function user() + { + return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/common/model/school/classes/order/OrderLog.php b/application/common/model/school/classes/order/OrderLog.php new file mode 100644 index 0000000..9b516db --- /dev/null +++ b/application/common/model/school/classes/order/OrderLog.php @@ -0,0 +1,95 @@ + __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3'), '6' => __('Status 6'), '9' => __('Status 9')]; + } + + public function getBeforeStatusList() + { + return ['-3' => __('Before_status -3'), '0' => __('Before_status 0'), '3' => __('Before_status 3'), '6' => __('Before_status 6'), '9' => __('Before_status 9')]; + } + + public function getServerStatusList() + { + return ['0' => __('Server_status 0'), '3' => __('Server_status 3'), '6' => __('Server_status 6')]; + } + + public function getResultStatusList() + { + return ['0' => __('Result_status 0'), '3' => __('Result_status 3'), '6' => __('Result_status 6')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getBeforeStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['before_status']) ? $data['before_status'] : ''); + $list = $this->getBeforeStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getServerStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['server_status']) ? $data['server_status'] : ''); + $list = $this->getServerStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getResultStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['result_status']) ? $data['result_status'] : ''); + $list = $this->getResultStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function order() + { + return $this->belongsTo('app\admin\model\school\classes\Order', 'classes_order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/manystore/controller/school/classes/VirtualUser.php b/application/manystore/controller/school/classes/VirtualUser.php index 591e9e7..d009d3d 100644 --- a/application/manystore/controller/school/classes/VirtualUser.php +++ b/application/manystore/controller/school/classes/VirtualUser.php @@ -22,7 +22,8 @@ class VirtualUser extends ManystoreBase { parent::_initialize(); $this->model = new \app\manystore\model\school\classes\VirtualUser; - + $this->view->assign("jointypeList", $this->model->getJointypeList()); + $this->view->assign("havetypeList", $this->model->getHavetypeList()); } public function import() diff --git a/application/manystore/lang/zh-cn/school/classes/hourorder/order.php b/application/manystore/lang/zh-cn/school/classes/hourorder/order.php index 27ca6a5..baf1820 100644 --- a/application/manystore/lang/zh-cn/school/classes/hourorder/order.php +++ b/application/manystore/lang/zh-cn/school/classes/hourorder/order.php @@ -15,6 +15,7 @@ return [ 'Verification_num' => '下单时已核销人数', 'Status' => '订单状态', 'Status -3' => '已取消', + 'Status -1' => '已报名待审核', 'Status 0' => '已预约', 'Status 3' => '已完成', 'Verification_user_id' => '核销人用户id', diff --git a/application/manystore/lang/zh-cn/school/classes/hourorder/order_log.php b/application/manystore/lang/zh-cn/school/classes/hourorder/order_log.php index 7caf33c..eb3f1f9 100644 --- a/application/manystore/lang/zh-cn/school/classes/hourorder/order_log.php +++ b/application/manystore/lang/zh-cn/school/classes/hourorder/order_log.php @@ -4,6 +4,7 @@ return [ 'Classes_hour_order_id' => '课时订单id', 'Status' => '订单状态', 'Status -3' => '已取消', + 'Status -1' => '已报名待审核', 'Status 0' => '已预约', 'Status 3' => '已完成', 'Log_text' => '记录内容', diff --git a/application/manystore/lang/zh-cn/school/classes/virtual_user.php b/application/manystore/lang/zh-cn/school/classes/virtual_user.php index 0b01b75..e6377bf 100644 --- a/application/manystore/lang/zh-cn/school/classes/virtual_user.php +++ b/application/manystore/lang/zh-cn/school/classes/virtual_user.php @@ -5,6 +5,12 @@ return [ 'Head_image' => '头像', 'Classes_lib_id' => '课程id', 'Time' => '虚拟下单时间', + 'Jointype' => '参与中', + 'Jointype 1' => '是', + 'Jointype 0' => '否', + 'Havetype' => '已报名', + 'Havetype 1' => '是', + 'Havetype 0' => '否', 'Schoolclasseslib.title' => '标题', 'Schoolclasseslib.headimage' => '头图' ]; diff --git a/application/manystore/model/Admin.php b/application/manystore/model/Admin.php new file mode 100644 index 0000000..31eb4a0 --- /dev/null +++ b/application/manystore/model/Admin.php @@ -0,0 +1,12 @@ + __('Jointype 1'), '0' => __('Jointype 0')]; + } + public function getHavetypeList() + { + return ['1' => __('Havetype 1'), '0' => __('Havetype 0')]; + } public function getTimeTextAttr($value, $data) @@ -39,6 +49,22 @@ class VirtualUser extends Model return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; } + + public function getJointypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['jointype']) ? $data['jointype'] : ''); + $list = $this->getJointypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getHavetypeTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['havetype']) ? $data['havetype'] : ''); + $list = $this->getHavetypeList(); + return isset($list[$value]) ? $list[$value] : ''; + } + protected function setTimeAttr($value) { return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value); diff --git a/application/manystore/model/school/classes/hourorder/Order.php b/application/manystore/model/school/classes/hourorder/Order.php index 48d5149..f1c0ddf 100644 --- a/application/manystore/model/school/classes/hourorder/Order.php +++ b/application/manystore/model/school/classes/hourorder/Order.php @@ -37,7 +37,7 @@ class Order extends Model public function getStatusList() { - return ['-3' => __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3')]; + return ['-3' => __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; } diff --git a/application/manystore/model/school/classes/hourorder/OrderLog.php b/application/manystore/model/school/classes/hourorder/OrderLog.php index 4ede8d6..eea4431 100644 --- a/application/manystore/model/school/classes/hourorder/OrderLog.php +++ b/application/manystore/model/school/classes/hourorder/OrderLog.php @@ -32,7 +32,7 @@ class OrderLog extends Model public function getStatusList() { - return ['-3' => __('Status -3'), '0' => __('Status 0'), '3' => __('Status 3')]; + return ['-3' => __('Status -3'),'-1' => __('Status -1'), '0' => __('Status 0'), '3' => __('Status 3')]; } diff --git a/application/manystore/view/school/classes/virtual_user/add.html b/application/manystore/view/school/classes/virtual_user/add.html index 11d838c..0dbc179 100644 --- a/application/manystore/view/school/classes/virtual_user/add.html +++ b/application/manystore/view/school/classes/virtual_user/add.html @@ -32,6 +32,30 @@
              +
              + +
              + + + +
              +
              +
              + +
              + + + +
              +
              diff --git a/application/manystore/view/school/classes/virtual_user/edit.html b/application/manystore/view/school/classes/virtual_user/edit.html index 3b3aaee..9ec068f 100644 --- a/application/manystore/view/school/classes/virtual_user/edit.html +++ b/application/manystore/view/school/classes/virtual_user/edit.html @@ -32,6 +32,30 @@
              +
              + +
              + + + +
              +
              +
              + +
              + + + +
              +
              diff --git a/public/assets/js/backend/school/classes/hourorder/order.js b/public/assets/js/backend/school/classes/hourorder/order.js index 1ea6d72..166b51e 100644 --- a/public/assets/js/backend/school/classes/hourorder/order.js +++ b/public/assets/js/backend/school/classes/hourorder/order.js @@ -40,14 +40,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'limit_num', title: __('Limit_num')}, {field: 'sign_num', title: __('Sign_num')}, {field: 'verification_num', title: __('Verification_num')}, - {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"-1":__('Status -1'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, {field: 'verification_user_id', title: __('Verification_user_id')}, {field: 'reservation_time', title: __('Reservation_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'cancel_time', title: __('Cancel_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'classesorder.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'spec.name', title: __('Spec.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'}, diff --git a/public/assets/js/backend/school/classes/hourorder/order_log.js b/public/assets/js/backend/school/classes/hourorder/order_log.js index 0d0ea39..ec76b15 100644 --- a/public/assets/js/backend/school/classes/hourorder/order_log.js +++ b/public/assets/js/backend/school/classes/hourorder/order_log.js @@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'classes_hour_order_id', title: __('Classes_hour_order_id')}, - {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"-1":__('Status -1'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, {field: 'log_text', title: __('Log_text'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, diff --git a/public/assets/js/backend/school/classes/virtual_user.js b/public/assets/js/backend/school/classes/virtual_user.js index d9803e1..cca381f 100644 --- a/public/assets/js/backend/school/classes/virtual_user.js +++ b/public/assets/js/backend/school/classes/virtual_user.js @@ -25,11 +25,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin columns: [ [ {checkbox: true}, + {field: 'id', title: __('Classes_lib_id')}, {field: 'id', title: __('Id')}, - {field: 'nickname', title: __('Nickname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'nickname', title: __('Nickname'), operate: 'LIKE'}, {field: 'head_image', title: __('Head_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'classes_lib_id', title: __('Classes_lib_id')}, - {field: 'time', title: __('Time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'time', title: __('Time'),operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'lib.title', title: __('Lib.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'lib.headimage', title: __('Lib.headimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} diff --git a/public/assets/js/manystore/school/classes/hourorder/order.js b/public/assets/js/manystore/school/classes/hourorder/order.js index c6df641..d51277c 100644 --- a/public/assets/js/manystore/school/classes/hourorder/order.js +++ b/public/assets/js/manystore/school/classes/hourorder/order.js @@ -38,7 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'limit_num', title: __('Limit_num')}, {field: 'sign_num', title: __('Sign_num')}, {field: 'verification_num', title: __('Verification_num')}, - {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"-1":__('Status -1'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, {field: 'verification_user_id', title: __('Verification_user_id')}, {field: 'reservation_time', title: __('Reservation_time')}, {field: 'finish_time', title: __('Finish_time')}, diff --git a/public/assets/js/manystore/school/classes/hourorder/order_log.js b/public/assets/js/manystore/school/classes/hourorder/order_log.js index 6f7642f..ebc763c 100644 --- a/public/assets/js/manystore/school/classes/hourorder/order_log.js +++ b/public/assets/js/manystore/school/classes/hourorder/order_log.js @@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'classes_hour_order_id', title: __('Classes_hour_order_id')}, - {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"-1":__('Status -1'),"0":__('Status 0'),"3":__('Status 3')}, formatter: Table.api.formatter.status}, {field: 'log_text', title: __('Log_text'), operate: 'LIKE'}, {field: 'createtime', title: __('Createtime')}, {field: 'schoolclasseshourorder.order_no', title: __('Schoolclasseshourorder.order_no'), operate: 'LIKE'}, diff --git a/public/assets/js/manystore/school/classes/virtual_user.js b/public/assets/js/manystore/school/classes/virtual_user.js index dfe4bc8..feb91b2 100644 --- a/public/assets/js/manystore/school/classes/virtual_user.js +++ b/public/assets/js/manystore/school/classes/virtual_user.js @@ -29,7 +29,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'nickname', title: __('Nickname'), operate: 'LIKE'}, {field: 'head_image', title: __('Head_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'classes_lib_id', title: __('Classes_lib_id')}, - {field: 'time', title: __('Time')}, + {field: 'time', title: __('Time'),operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'jointype', title: __('Jointype'), searchList: {"1":__('Jointype 1'),"0":__('Jointype 0')}, formatter: Table.api.formatter.normal}, + {field: 'havetype', title: __('Havetype'), searchList: {"1":__('Havetype 1'),"0":__('Havetype 0')}, formatter: Table.api.formatter.normal}, {field: 'schoolclasseslib.title', title: __('Schoolclasseslib.title'), operate: 'LIKE'}, {field: 'schoolclasseslib.headimage', title: __('Schoolclasseslib.headimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}