修复退款订单返回false 问题及 猜你喜欢 内容数据格式不对

mobile/control/activity.php

@@ -315,7 +315,7 @@ class activityControl extends mobileControl
 
     public function actingOp()
     {
-        $actings = activity_helper::acting();
+        $actings = array();//activity_helper::acting();
         $formater = new act_formater($actings);
         $result = $formater->format_acting();
 

mobile/control/member_order.php

@@ -55,8 +55,11 @@ class member_orderControl extends mbMemberControl
             return self::outerr(errcode::ErrParamter);
         }
         $order = $this->get_order(array("buyer_id" => $_SESSION['member_id'],'pay_sn' => $pay_sn));
-        if($order == false) $order = null;
-        self::outsuccess(array('order' => $order));
+        if($order == false) {
+            return self::outerr(errcode::ErrOrder);
+        } else {
+            self::outsuccess(array('order' => $order));
+        }
     }
 
     public function pay_infoOp()
@@ -67,8 +70,11 @@ class member_orderControl extends mbMemberControl
         }
         $order = $this->get_order(array("buyer_id" => $_SESSION['member_id'],'pay_sn' => $pay_sn));
         $pay_ments = pay_helper::pay_types();
-        if($order == false) $order = null;
-        self::outsuccess(array('order' => $order,"paytype" => $pay_ments));
+        if($order == false) {
+            return self::outerr(errcode::ErrOrder);
+        } else {
+            self::outsuccess(array('order' => $order,"paytype" => $pay_ments));
+        }
     }
 
     public function change_stateOp()
@@ -84,15 +90,20 @@ class member_orderControl extends mbMemberControl
         $action = new order_action();
         $fOk = $action->change_state($state_type,$order_id);
 
-        if($fOk == true) {
+        if($fOk == true)
+        {
             $order = $this->get_order(array("buyer_id" => $_SESSION['member_id'],'order_id' => $order_id));
-            if($order == false) $order = null;
-
-            return self::outsuccess(array("act_type" => $act_type,"order_id" => $order_id, "order" => $order));
-        } else {
+            if($order == false) {
+                return self::outerr(errcode::ErrOrder);
+            } else {
+                return self::outsuccess(array("act_type" => $act_type,"order_id" => $order_id, "order" => $order));
+            }
+        }
+        else {
             return self::outerr(errcode::ErrOrder);
         }
     }
+
     private function state_type($act_type)
     {
         if($act_type == "if_cancel") return "order_cancel";
@@ -132,7 +143,6 @@ class member_orderControl extends mbMemberControl
             return self::outsuccess($out_put);
         }
     }
-
     ///////////////////////////////////////////////////////////////////下面是老接口///////////////////////////////////////////////////////////////////////////
     public function order_listOp()
     {

mobile/control/member_refund.php

@@ -38,9 +38,16 @@ class member_refundControl extends mbMemberControl
         $refund = $helper->view($refund_id,$err);
         if($refund == false) {
             return self::outerr($err['code'],$err['msg']);
-        } else {
+        }
+        else
+        {
             $order = $this->get_order(array('order_id' => $refund['order_id'],'buyer_id' => $_SESSION['member_id']));
-            return self::outsuccess(array('refund' => $refund,'order' => $order));
+
+            if($order == false) {
+                return self::outerr(errcode::ErrParamter,"查不到该订单");
+            } else {
+                return self::outsuccess(array('refund' => $refund,'order' => $order));
+            }
         }
     }
 
@@ -58,7 +65,11 @@ class member_refundControl extends mbMemberControl
         else
         {
             $order = $this->get_order(array('order_sn' =>$order_sn,'buyer_id' => $_SESSION['member_id']));
-            self::outsuccess(array('order' => $order));
+            if($order == false) {
+                return self::outerr(errcode::ErrParamter,"查不到该订单");
+            } else {
+                return self::outsuccess(array('order' => $order));
+            }
         }
     }
 
@@ -80,16 +91,22 @@ class member_refundControl extends mbMemberControl
             $reason_list = $ret['reason_list'];
             $goods_pay_price = doubleval($ret['goods']['goods_pay_price']);
             $order = $this->get_order(array('order_sn' =>$order_sn,'buyer_id' => $_SESSION['member_id']));
-            $order_goods = &$order['order_goods'];
-            foreach ($order_goods as &$item)
+            if ($order != false)
             {
-                if($item['rec_id'] == $rec_id) {
-                    $item['goods_pay_price'] = $goods_pay_price;
-                    break;
+                $order_goods = &$order['order_goods'];
+                foreach ($order_goods as &$item)
+                {
+                    if($item['rec_id'] == $rec_id) {
+                        $item['goods_pay_price'] = $goods_pay_price;
+                        break;
+                    }
                 }
+                return self::outsuccess(array("reason_list" => $reason_list,'rec_id' => $rec_id,'order' => $order));
+            }
+            else
+            {
+                return self::outerr(errcode::ErrParamter,"查不到该订单");
             }
-
-            return self::outsuccess(array("reason_list" => $reason_list,'rec_id' => $rec_id,'order' => $order));
         }
     }
 
@@ -110,9 +127,15 @@ class member_refundControl extends mbMemberControl
 
         if($ret == false) {
             return self::outerr($err['code'],$err['msg']);
-        } else {
+        }
+        else
+        {
             $order = $this->get_order(array('order_sn' =>$order_sn,'buyer_id' => $_SESSION['member_id']));
-            return self::outsuccess(array('order' => $order));
+            if($order == false) {
+                return self::outerr(errcode::ErrParamter,"查不到该订单");
+            } else {
+                return self::outsuccess(array('order' => $order));
+            }
         }
     }
 

mobile/control/search.php

@@ -210,7 +210,11 @@ class searchControl extends mobileHomeControl
         }
         else
         {
-            $blocks = array_merge($blocks,$guslike['special_list']);
+            $gus_blocks = $guslike['special_list'];
+            if(!empty($gus_blocks)) {
+                $blocks[] = $gus_blocks[0];
+            }
+
             $guslike['special_list'] = $blocks;
             $guslike['mobile_page'] = mobile_page(1);
 
@@ -227,22 +231,21 @@ class searchControl extends mobileHomeControl
         else
         {
             $goods_ids = [];
-            foreach ($goodslist as $value) {
-                $goods_ids[] = intval($value);
+            foreach ($goodslist as $value)
+            {
+                if (intval($value) > 0) {
+                    $goods_ids[] = intval($value);
+                }
             }
 
             $model_goods = Model('goods');
-            $goods_list = $model_goods->getGoodsListByColorDistinct(array('goods_id' => array('in',$goods_ids)),
-                goods_helper::fieldstr);
-
-            $blocks = [];
+            $goods_list = $model_goods->getGoodsListByColorDistinct(array('goods_id' => array('in',$goods_ids)), goods_helper::fieldstr);
             $block = special_helper::format_goods($goods_ids,"～猜你喜欢～");
-            $blocks[] = $block;
 
             $helper = new goods_helper();
             $ret = $helper->get_summaryex($goods_list,$related_goods);
 
-            return array('special_list' => $blocks,
+            return array('special_list' => array($block),
                 'summary'  => $ret['summary'],
                 'groupbuy' => $ret['groupbuy'],
                 'limitime' => $ret['limitime'],