1

models/UserCollect.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "cx_user_collect".
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property int $goods_id 卡券id
+ */
+class UserCollect extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'cx_user_collect';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['user_id', 'goods_id'], 'required'],
+            [['user_id', 'goods_id'], 'integer'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'user_id' => 'User ID',
+            'goods_id' => 'Goods ID',
+        ];
+    }
+}

modules/admin/views/store/store-user-edit.php

@@ -76,7 +76,6 @@ $this->params['breadcrumbs'][] = $this->title;
                         </div>
 
 
-
                         <div class="layui-form-item" style="display: block">
                             <label class="layui-form-label required">案例状态</label>
                             <div class="layui-input-block">
@@ -89,9 +88,6 @@ $this->params['breadcrumbs'][] = $this->title;
                         </div>
 
 
-
-
-
                         <div class="layui-form-item layui-form-text">
                             <label class="layui-form-label">标题</label>
                             <div class="layui-input-block">
@@ -103,12 +99,13 @@ $this->params['breadcrumbs'][] = $this->title;
 
                         <?= PickFile::widget([
                             'accept' => 'file',
+                            'multiple' => true,
                             'id' => 'cover_pic',
                             'name' => 'cover_pic',
                             'label' => '封面',
                             'value' => $model->cover_pic ? $model->cover_pic : '',
                             'tip' => '建议图片大小650×320',
-                            'required' => true,
+                            'required' => false,
                             'imageCompressEnable' => 1,
                             'imageCompressBorder' => 750,
                         ]) ?>
@@ -133,7 +130,8 @@ $this->params['breadcrumbs'][] = $this->title;
                         <!--                                <textarea id="editor" style="width: 100%"-->
                         <!--                                          name="content"-->
                         <!--                                          rows="30">-->
-<!--                                      <div class="layui-form-mid layui-word-aux">--><?//= $model->content ? $model->content : "" ?><!--</div>-->
+                        <!--                                      <div class="layui-form-mid layui-word-aux">-->
+                        <? //= $model->content ? $model->content : "" ?><!--</div>-->
                         <!--                                </textarea>-->
                         <!--                            </div>-->
                         <!---->
@@ -179,6 +177,10 @@ $this->params['breadcrumbs'][] = $this->title;
 
         form.render();
 
+        $('.layui-card-body').change(function(){
+            console.log(window._filelist_cover_pic)
+        })
+
         //提交
         var submitLock = false;
         form.on('submit(layui-form-submit)', function (obj) {
@@ -192,6 +194,14 @@ $this->params['breadcrumbs'][] = $this->title;
             var url = '<?= \Yii::$app->urlManager->createUrl(["/admin/store/store-user-edit", 'id' => $model->id ? $model->id : 0]) ?>';
             var returnUrl = "<?= $return_url ?>";
             var data = obj.field;
+            var urls = []
+            urls = window._filelist_cover_pic.map(function(val){
+                console.log(val)
+                return val.url
+            })
+
+            data.cover_pic = JSON.stringify(urls);
+
             // data.pic_urls = JSON.stringify(_gallery_pic_urls);
             // data.content = UE.getEditor('editor').getContent();
             data._csrf = _csrf;

modules/api/controllers/StoreController.php

@@ -49,6 +49,7 @@ class StoreController extends Controller
                     'api/store/shopowner',
                     'api/store/store-service',
                     'api/store/box',
+                    'api/store/box-list',
                     'api/store/shopowner-make',
                     'api/store/shopowner-make-list',
                     'api/store/check-out',
@@ -234,7 +235,7 @@ class StoreController extends Controller
 
 
     /**
-     * 包厢
+     * 案例列表
      */
     public function actionBox()
     {
@@ -244,15 +245,29 @@ class StoreController extends Controller
 
         $form->page = $get['page'] ?? 1;
         $form->limit = $get['limit'] ?? 99;
-        $form->box_id = $get['box_id'];
+        $form->keywords = $get['keywords'] ?? 99;
-        $form->store_id = $get['store_id'];
-        $form->date = $get['date'];
-        $form->user_id = \Yii::$app->user->identity->id;
 
         $data = $form->search();
         return $this->responseHandler($data);
     }
 
+    /**
+     * 案例列表
+     */
+    public function actionBoxList()
+    {
+        $request = Yii::$app->request;
+        $get = $request->get();
+        $form = new BoxForm();
+
+        $form->page = $get['page'] ?? 1;
+        $form->limit = $get['limit'] ?? 99;
+
+        $data = $form->lists();
+        return $this->responseHandler($data);
+    }
+
+
     /**
      * showdoc
      * @catalog 门店申请

modules/api/controllers/UserController.php

@@ -22,6 +22,7 @@ use app\models\UserInformation;
 use app\modules\api\behaviors\LoginBehavior;
 use app\modules\api\models\CommentForm;
 use app\modules\api\models\UserBasicInfoForm;
+use app\modules\api\models\UserCollectForm;
 use app\modules\api\models\UserModifyForm;
 
 class UserController extends Controller
@@ -32,7 +33,11 @@ class UserController extends Controller
             'login' => [
                 'class' => LoginBehavior::className(),
                 'ignore' => [
-                    'api/user/add-qrcode-find'
+                    'api/user/add-qrcode-find',
+//                    'api/user/user-collect-list',
+                    'api/user/user-collect-hot',
+//                    'api/user/user-collect',
+//                    'api/user/user-collect-del',
                 ]
             ]
         ]);
@@ -555,14 +560,15 @@ class UserController extends Controller
      * @description 获取分销列表
      * @method get
      * @url /api/user/user-next-list
-     * @return {"code":0,"msg":"ok","data":{}}
      * @param page int 页码
      * @param limit int 页数
      * @return_param nickname string 昵称
      * @return_param avatar_url string 头像
      * @return_param mobile_phone string 手机号
+     * @return {"code":0,"msg":"ok","data":{}}
      */
-    public function actionUserNextList(){
+    public function actionUserNextList()
+    {
         $form = new UserBasicInfoForm();
         $form->cx_mch_id = $this->cx_mch_id;
         $form->user_id = \Yii::$app->user->identity->id;
@@ -597,4 +603,79 @@ class UserController extends Controller
     }
 
 
+    /**
+     * showdoc
+     * @catalog 用户收藏列表
+     * @title 用户收藏列表
+     * @description 用户收藏列表
+     * @method get
+     * @url /api/user/user-collect-list
+     * @return {"code":0,"msg":"ok","data":{}}
+     */
+    public function actionUserCollectList()
+    {
+        $form = new UserCollectForm();
+        $form->user_id = \Yii::$app->user->identity->id;
+//        $form->user_id = 124;
+        $data = $form->search();
+        return $this->responseHandler($data);
+    }
+
+
+    /**
+     * showdoc
+     * @catalog 用户收藏列表
+     * @title 用户收藏列表
+     * @description 用户收藏列表
+     * @method get
+     * @url /api/user/user-collect-list
+     * @return {"code":0,"msg":"ok","data":{}}
+     */
+    public function actionUserCollectHot()
+    {
+        $form = new UserCollectForm();
+        $data = $form->hot();
+        return $this->responseHandler($data);
+    }
+
+    /**
+     * showdoc
+     * @catalog 用户收藏
+     * @title 用户收藏
+     * @description 用户收藏
+     * @method get
+     * @url /api/user/user-collect
+     * @return {"code":0,"msg":"ok","data":{}}
+     */
+    public function actionUserCollect()
+    {
+        $form = new UserCollectForm();
+        $form->user_id = \Yii::$app->user->identity->id;
+        $goods_id = \Yii::$app->request->post('goods_id');
+
+//        $form->user_id = 124;
+        $form->goods_id = $goods_id;
+
+        $data = $form->collect();
+        return $this->responseHandler($data);
+    }
+
+
+    /**
+     * 取消收藏
+     * @return array
+     * @throws \Throwable
+     * @throws \yii\db\StaleObjectException
+     */
+    public function actionUserCollectDel()
+    {
+        $form = new UserCollectForm();
+        $id = \Yii::$app->request->post('id');
+
+//        $form->user_id = 124;
+        $form->user_id = \Yii::$app->user->identity->id;
+        $form->id = $id;
+        $data = $form->del();
+        return $this->responseHandler($data);
+    }
 }

modules/api/models/BoxForm.php

@@ -23,6 +23,7 @@ use app\models\GoodsHub;
 use app\models\Order;
 use app\models\OrderDetail;
 use app\models\Store;
+use app\models\StoreBj;
 use app\models\User;
 use app\components\auth\AToken;
 use app\components\EncryptHelper;
@@ -39,12 +40,8 @@ class BoxForm extends ApiModel
     public $page; //页数
     public $pageCount; // 总页数
 
-    public $store_id;
+    public $bj_id;
-    public $box_id;
+    public $keywords;
-    public $interval = 1;
-
-    public $date;
-    public $user_id;
 
 
     public function rules()
@@ -59,151 +56,55 @@ class BoxForm extends ApiModel
     public function search()
     {
 
-        if (empty($this->box_id)) {
+        $query = Box::find()->alias('b')
-            return $this->apiReturnError('包厢ID不能为空');
+            ->leftJoin(['goods' => Goods::tableName()], 'b.goods_id=goods.id')
+            ->leftJoin(['goodHub' => GoodsHub::tableName()], 'goods.goods_hub_id=goodHub.id')
+            ->leftJoin(['storeBj' => StoreBj::tableName()], 'b.bj_id=storeBj.id')
+            ->select('b.id,b.created_at,b.cover_pic,b.status,goodHub.name as goods_name,storeBj.name as bj_name')
+            ->where([
+                'b.status' => 1,
+                'b.is_delete' => 0
+            ])
+            ->andFilterWhere(['b.bj_id' => $this->bj_id])
+            ->andFilterWhere(['OR',
+                ['like', 'goodHub.name', $this->keywords]]);
+
+        $count = $query->count();
+        $pagination = new Pagination(['totalCount' => $count, 'pageSize' => $this->limit]);
+        $list = $query->offset($pagination->offset)->limit($pagination->limit)->orderBy(['b.created_at' => SORT_DESC])->asArray()->all();
+        foreach ($list as $index => $item) {
+//            $item['business'] = $item['begin_time'] . '-' . $item['end_time'];
+            $list[$index]['created_at_cn'] = date("Y-m-d H:i", $item['created_at']);
+            if ($item['cover_pic'] != null) {
+                $pic_arr = json_decode($item['cover_pic'], true);
+
+                if (is_array($pic_arr)) {
+                    foreach ($pic_arr as $key => $value) {
+                        $arr[] = SiteHelper::getFullUrl($value);
+//                        $pic_arr[] = $arr;
+                    }
+                    $list[$index]['cover_pic_arr'] = $arr;
+                }
             }
 
-        if (empty($this->date)) {
-            return $this->apiReturnError('预定日期不能为空');
         }
-        $where = ['id' => $this->box_id, 'status' => 1, 'is_delete' => 0];
+        $data = [];
-
+        $data['code'] = 0;
-        $list = Box::find()->where($where)
+        $data['msg'] = 'ok';
-            ->select('id,name,notice,money,pic_urls,content,device')->asArray()->one();
+        $data['data'] = $list;
-
+        $data['count'] = $count;
-        $list['device'] = json_decode($list['device'], true);
+        return $data;
-
-        if ($list['pic_urls']) {
-            $store_pics = json_decode($list['pic_urls'], true);
-            foreach ($store_pics as $k => $v) {
-                $list['pic_arr'][] = SiteHelper::getFullUrl($v);
-            }
-            unset($list['pic_urls']);
-        }
-        $s = strtotime($this->date); # 开始时间
-        $arr = [];
-        for ($i = 0; $i < 24; $i++) {
-            $arr[$s] = [
-                'start' => date('H:i', $s),
-                'stop' => date('H:i', $s + 60 * 60),
-                'scope' => date('H:i', $s) . "-" . date('H:i', $s + 60 * 60),
-                'status' => 0,
-            ];
-            $s += 60 * 60;
-        }
-        $arr[$s - 60 * 60]['stop'] = date('H:59', $s - 60 * 60);
-
-        // 获取已下单数据
-        $query = Order::find()->alias('o')
-            ->innerJoin(['rt' => OrderDetail::tableName()], 'o.id=rt.order_id')
-            ->where(['o.store_id' => $this->store_id, 'coach_id' => $this->box_id, 'o.is_delete' => 0, 'o.cancel_status' => 0, 'o.plugin_sign' => 'box_book'])
-            ->andWhere(['IN', 'o.status', [0, 1]])
-            ->select('rt.start_at as start,rt.end_at as stop,o.user_id,o.is_pay')
-            ->asArray()
-            ->all();
-        if (!empty($query)) {
-            $t_arr = [];
-            foreach ($query as $key => $val) {
-                $t = strtotime(date('Y-m-d H:00', $val['start']));
-                while (true) {
-                    if ($t >= $val['stop']) {
-                        break;
-                    }
-                    // 如果是自己，可以继续选择,并且未支付
-                    if ($val['user_id'] == $this->user_id && empty($val['is_pay'])) {
-                        $t_arr[$t] = 0;
-                    } else {
-                        $t_arr[$t] = 1;
-                    }
-                    $t += 60 * 60;
-                }
-            }
-            foreach ($arr as $key => $val) {
-                if (!empty($t_arr[$key])) {
-                    $arr[$key]['status'] = 1;
-                    $arr[$key]['data'] = $t_arr;
-                }
-            }
-        }
-        return [
-            'code' => 0,
-            'msg' => 'ok',
-            'data' => $list,
-            'date_list' => array_merge($arr),
-            'data_res' => $query,
-        ];
     }
 
 
-    public function getBoxBookStatus($start_time, $end_time, $data)
+    public function lists()
     {
-        $start_time = strtotime($start_time);
+        $store = StoreBj::find()->where(['is_delete' => 0, 'status' => 1])->asArray()->all();
-        $end_time = strtotime($end_time);
+        $data = [];
-
+        $data['code'] = 0;
-        $query = Order::find()->alias('o')
+        $data['msg'] = 'ok';
-            ->innerJoin(['rt' => OrderDetail::tableName()], 'o.id=rt.order_id')
+        $data['data'] = $store;
-            ->where(['o.store_id' => $this->store_id, 'coach_id' => $this->box_id, 'o.is_delete' => 0, 'o.cancel_status' => 0])
+        return $data;
-            ->andWhere(['>=', 'rt.start_at', $start_time])
-            ->andWhere(['<=', 'rt.end_at', $end_time])
-            ->andWhere(['IN', 'o.status', [1, 3]])
-            ->select('rt.start_at,rt.end_at')
-            ->asArray()
-//        $count_query = clone $query;
-            ->all();
-//
-//        var_dump($query->createCommand()->getRawSql());
-//        die();
-
-
-        if (!isset($query)) {
-            return false;
     }
 
-        //$beginTime1 订单预约的开始时间  $endTime1 订单预约的结束时间
-        //$beginTime2 下单的开始时间  $endTime2 下单的结束时间
-
-        foreach ($query as $key => $value) {
-            $beginTime1 = $value['start_at'];
-            $endTime1 = $value['end_at'];
-            $beginTime2 = $data['start'];
-            $endTime2 = $data['stop'];
-            $date_diff = $this->is_time_cross($beginTime1, $endTime1, $beginTime2, $endTime2);
-            if ($date_diff == true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    function is_time_cross($beginTime1 = '', $endTime1 = '', $beginTime2 = '', $endTime2 = '')
-    {
-        $status = $beginTime2 - $beginTime1;
-        if ($status > 0) {
-            $status2 = $beginTime2 - $endTime1;
-            if ($status2 > 0) {
-                return false;
-            } elseif ($status2 < 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } elseif ($status < 0) {
-            $status2 = $endTime2 - $beginTime1;
-            if ($status2 > 0) {
-                return true;
-            } else if ($status2 < 0) {
-                return false;
-            } else {
-                return false;
-            }
-        } else {
-            $status2 = $endTime2 - $beginTime1;
-            if ($status2 == 0) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-    }
 }

modules/api/models/UserCollectForm.php

@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @author Any
+ * @description KISS
+ * @date 2020-12-2
+ * @version 1.0.0
+ *
+ * _____LOG_____
+ *
+ */
+
+namespace app\modules\api\models;
+
+use function AlibabaCloud\Client\value;
+use app\components\FlashStorage;
+use app\components\SiteHelper;
+use app\models\Coach;
+use app\models\DeviceUniqueBindUser;
+use app\models\Goods;
+use app\models\GoodsHub;
+use app\models\Store;
+use app\models\User;
+use app\components\auth\AToken;
+use app\components\EncryptHelper;
+use app\models\UserCollect;
+use app\modules\api\components\ApiHelper;
+use app\modules\api\components\GetDistance;
+use yii\data\Pagination;
+
+
+class UserCollectForm extends ApiModel
+{
+
+    public $limit;//条数
+    public $page; //页数
+    public $pageCount; // 总页数
+
+
+    public $user_id;
+    public $goods_id;
+
+    public $id;
+
+    public function rules()
+    {
+        return [
+            [['limit', 'page'], 'integer'],
+            [['page'], 'default', 'value' => 1],
+        ];
+    }
+
+
+    /**
+     * 收藏列表
+     */
+    public function search()
+    {
+
+        if (empty($this->limit)) {
+            $this->limit = 10;
+        }
+        if (empty($this->page)) {
+            $this->page = 1;
+        }
+        $query = UserCollect::find()->alias('user')
+            ->leftJoin(['goods' => Goods::tableName()], 'user.goods_id=goods.id')
+            ->leftJoin(['goodHub' => GoodsHub::tableName()], 'goods.goods_hub_id=goodHub.id')
+            ->select('user.id,goods.id as goods_id,goodHub.cover_pic')
+            ->where([
+                'user.user_id' => $this->user_id,
+            ]);
+
+        $count = $query->count();
+        $pagination = new Pagination(['totalCount' => $count, 'pageSize' => $this->limit]);
+        $list = $query->offset($pagination->offset)->limit($pagination->limit)->orderBy(['user.id' => SORT_DESC])->asArray()->all();
+
+        foreach ($list as $key => $value) {
+            $value['cover_pic'] = SiteHelper::getFullUrl($value['cover_pic']);
+            $list[$key] = $value;
+        }
+
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = 'ok';
+        $data['data'] = $list;
+        $data['count'] = $count;
+        return $data;
+    }
+
+
+    public function collect()
+    {
+        if (empty($this->goods_id)) {
+            return $this->apiReturnError('收藏的冠军错误');
+        }
+
+        $goods = Goods::findOne(['id' => $this->goods_id]);
+        if ($goods == null) {
+            return $this->apiReturnError('冠军不存在');
+
+        }
+
+        $model = new UserCollect();
+        $model->user_id = $this->user_id;
+        $model->goods_id = $this->goods_id;
+        if (!$model->save()) {
+            return $this->getModelError($model);
+        }
+        return [
+            'code' => 0,
+            'msg' => '收藏成功'
+        ];
+
+    }
+
+
+    /**
+     * @return array
+     * @throws \Throwable
+     * @throws \yii\db\StaleObjectException
+     */
+    public function del()
+    {
+        if (empty($this->id)) {
+            return $this->apiReturnError('收藏的ID错误');
+        }
+
+        $model = UserCollect::findOne(['id' => $this->id]);
+        if ($model == null) {
+            return $this->apiReturnError('收藏不存在');
+
+        }
+
+        if (!$model->delete()) {
+            return $this->getModelError($model);
+        }
+        return [
+            'code' => 0,
+            'msg' => '取消收藏成功'
+        ];
+    }
+
+
+    public function hot()
+    {
+        $query = Goods::find()->alias('goods')
+            ->leftJoin(['goodHub' => GoodsHub::tableName()], 'goods.goods_hub_id=goodHub.id')
+            ->select('goods.id as goods_id,goodHub.cover_pic')
+            ->where([
+                'goods.is_delete' => 0,
+            ]);
+
+        $count = $query->count();
+        $pagination = new Pagination(['totalCount' => $count, 'pageSize' => 20]);
+        $list = $query->offset($pagination->offset)->limit($pagination->limit)->orderBy(['goods.id' => SORT_DESC])->asArray()->all();
+        foreach ($list as $key => $value) {
+            $value['cover_pic'] = SiteHelper::getFullUrl($value['cover_pic']);
+            $list[$key] = $value;
+        }
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = 'ok';
+        $data['data'] = $list;
+        $data['count'] = $count;
+        return $data;
+
+    }
+}