Merge branch 'sess_0306' of 121.43.114.153:/home/git/repositories/shopnc into sess_0306

data/model/refund_return.model.php

@@ -614,6 +614,7 @@ class refund_returnModel extends Model
         $condition = array();
         $condition['refund_type'] = 1;
         $condition['order_id']    = $order['order_id'];
+        $condition['seller_state'] = array('lt', '3'); //状态:1为待审核,2为同意,3为不同意
         $result = $this->getRefundReturnList($condition,'','refund_id');
 
         if(!empty($result)){
@@ -638,6 +639,7 @@ class refund_returnModel extends Model
         $condition['refund_type'] = 2;
         $condition['order_id']    = $good['order_id'];
         $condition['goods_id']    = $good['goods_id'];
+        $condition['seller_state'] = array('lt', '3'); //状态:1为待审核,2为同意,3为不同意
         $result = $this->getRefundReturnList($condition,'','refund_id');
 
         if(!empty($result)){

mobile/control/bonus.php

@@ -189,6 +189,8 @@ class bonusControl extends mobileHomeControl
             } else {
                 return joutput_error(errcode::ErrMobileNotBinded);
             }
+        } else{
+            return joutput_error(errcode::ErrMobileNotBinded);
         }
     }
 }

mobile/control/member_refund.php

@@ -73,11 +73,11 @@ class member_refundControl extends mbMemberControl
         $pic_array = array();
         $pic_array['buyer'] = array();
         $refund_array['pic_info'] = serialize($pic_array);
-        $state = $model_refund->addRefundReturn($refund_array, $order);
+        $refund_id = $model_refund->addRefundReturn($refund_array, $order);
 
-        if ($state) {
+        if ($refund_id) {
             $model_refund->editOrderLock($order_id);
-            return self::outsuccess(array("ret" => 1));
+            return self::outsuccess(array("ret" => 1,"refund_id"=>$refund_id));
         } else {
             return self::outerr(errcode::ErrOrderRefundError, "退款失败.");
         }
@@ -238,13 +238,13 @@ class member_refundControl extends mbMemberControl
         $refund_array['goods_num'] = $goods_num;
         $refund_array['buyer_message'] = $buyer_msg;
         $refund_array['add_time'] = time();
-        $state = $model_refund->addRefundReturn($refund_array, $order, $goods);
+        $refund_id = $model_refund->addRefundReturn($refund_array, $order, $goods);
 
-        if ($state) {
+        if ($refund_id) {
             if ($order['order_state'] == $order_shipped) {
                 $model_refund->editOrderLock($order_id);
             }
-            return self::outsuccess(array('ret' => 1));
+            return self::outsuccess(array('ret' => 1,"refund_id"=>$refund_id));
         } else {
             return self::outerr(errcode::ErrOrderRefundError, "退货失败.");
         }