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

mobile/control/bonus.php

@@ -7,7 +7,7 @@
  ***/
 defined('InShopNC') or exit('Access Invalid!');
 
-class bonusControl extends mobileMemberControl
+class bonusControl extends mobileMemberExControl
 {
     public function __construct()
     {
@@ -16,6 +16,17 @@ class bonusControl extends mobileMemberControl
 
     public function bonus_listOp()
     {
+        // 检验token
+        $token = $_GET['key'];
+
+        if (empty($token)) {
+            return joutput_error(errcode::ErrInputParam, '输入参数有误');
+        }
+
+        if ($this->checkToken($token) != errcode::Success) {
+            return joutput_error($this->err_code, errcode::msg($this->err_code));
+        }
+
         // 根据token获取用户ID
         $condition['user_id'] = $this->member_info['member_id'];
 
@@ -51,7 +62,18 @@ class bonusControl extends mobileMemberControl
     }
 
     // 红包绑定
-    public function bind_bonusOp(){
+    public function bind_bonusOp()
+    {
+        // 检验token
+        $token = $_GET['key'];
+
+        if (empty($token)) {
+            return joutput_error(errcode::ErrInputParam, '输入参数有误');
+        }
+
+        if ($this->checkToken($token) != errcode::Success) {
+            return joutput_error($this->err_code, errcode::msg($this->err_code));
+        }
 
         // 获取user_id
         $condition['member_id'] = $this->member_info['member_id'];
@@ -61,25 +83,38 @@ class bonusControl extends mobileMemberControl
             // get member_mobile 获取用户手机号
             $member = Model()->table("member")->field("member_mobile")->where($condition)->select();
 
-            if(!empty($member)){
+            if (!empty($member)) {
 
-                $user_bonus = Model()->table("user_bonus")->where(array('user_mobile'=>$member[0]['member_mobile'],'user_id'=>0))->select();
+                $user_bonus = Model()->table("user_bonus")->where(array('user_mobile' => $member[0]['member_mobile'], 'user_id' => 0))->select();
 
                 // 更新user_bonus
-                if(!empty($user_bonus)){
+                if (!empty($user_bonus)) {
+
+                    $bonus_info = array();
+                    foreach ($user_bonus as $value) {
+
+                        $bonus_type = Model()->table('bonus_type')->where(array('type_id' => $value['bonus_type_id']))->limit(1)->select();
+
+                        $info = [];
+                        $info['sender'] = $bonus_type[0]['sender'];
+                        $info['type_name'] = $bonus_type[0]['type_name'];
+                        $info['bonus_value'] = $value['bonus_value'];
 
+                        array_push($bonus_info, $info);
+                    }
+                    // 更新为已领取
                     $data['user_id'] = $this->member_info['member_id'];
-                    $ret = Model()->table('user_bonus')->where(array('user_mobile'=>$member[0]['member_mobile']))->update($data);
+                    $ret = Model()->table('user_bonus')->where(array('user_mobile' => $member[0]['member_mobile']))->update($data);
 
                     // 返回存在红包
-                    joutput_data(array('have_bonus' => 1));
+                    joutput_data(array('have_bonus' => 1, 'bonus_info' => $bonus_info));
 
-                } else{
-                    joutput_data(array('have_bonus' => 0));
+                } else {
+                    joutput_data(array('have_bonus' => 0, 'bonus_info' => null));
                 }
 
-            } else{
-                return joutput_error(errcode::ErrTokenExpire,"用户手机号没绑定");
+            } else {
+                return joutput_error(errcode::ErrTokenExpire, "用户手机号没绑定");
             }
         }
     }