dongxiaoqin пре 1 година
родитељ
комит
ee2ec09819
2 измењених фајлова са 12 додато и 11 уклоњено
  1. 5 4
      app/api/controller/GroupActivityController.php
  2. 7 7
      app/api/logic/GroupActivityLogic.php

+ 5 - 4
app/api/controller/GroupActivityController.php

@@ -23,7 +23,8 @@ class GroupActivityController extends BaseApiController
      */
     public function categoryList()
     {
-        $result = GroupActivityLogic::categoryList();
+        $id = (int)$this->request->param('id');
+        $result = GroupActivityLogic::categoryList($id);
         return $this->data($result);
     }
 
@@ -32,7 +33,7 @@ class GroupActivityController extends BaseApiController
      */
     public function detail()
     {
-        $id = $this->request->param('id');
+        $id = (int)$this->request->param('id');
         $result = GroupActivityLogic::detail($id,$this->userId);
         return $this->data($result);
     }
@@ -41,7 +42,7 @@ class GroupActivityController extends BaseApiController
      * 拼团订单详情
      */
     public function orderDetail(){
-        $order_id = $this->request->param('order_id');
+        $order_id = (int)$this->request->param('order_id');
         $result = GroupActivityLogic::orderDetail($order_id,$this->request->domain());
         return $this->data($result);
     }
@@ -50,7 +51,7 @@ class GroupActivityController extends BaseApiController
      * 用户订单详情
      */
     public function userOrderDetail(){
-        $order_id = $this->request->param('order_id');
+        $order_id = (int)$this->request->param('order_id');
         $result = GroupActivityLogic::userOrderDetail($order_id,$this->userId);
         return $this->data($result);
     }

+ 7 - 7
app/api/logic/GroupActivityLogic.php

@@ -28,15 +28,15 @@ class GroupActivityLogic extends BaseLogic
 {
 
     /**
-     * 活动分类列表
+     * 活动分类数据
      */
-    public static function categoryList(){
-        $list = GroupActivityCategory::where('status',1)->field('id,title,images,block_data')->select()->toArray();
-        foreach($list as &$item) {
-            $item['images'] = $item['images'] ? explode(",",$item['images']) : [];
-            $item['block_data'] = $item['block_data'] ? json_decode($item['block_data'],true) : [];
+    public static function categoryList($id){
+        $detail = GroupActivityCategory::where('id',$id)->where('status',1)->field('id,title,images,block_data')->findOrEmpty()->toArray();
+        if($detail) {
+            $detail['images'] = $detail['images'] ? explode(",",$detail['images']) : [];
+            $detail['block_data'] = $detail['block_data'] ? json_decode($detail['block_data'],true) : [];
         }
-        return $list;
+        return $detail;
     }
 
     /**