1

application/api/controller/Secondary.php

@@ -288,7 +288,7 @@ class Secondary extends Base
                 if ($info['resale_status']==1) $this->error('藏品已撤销出售');
                 if ($info['mid']==$this->uid) $this->error('不能购买自己出售的藏品');
 
-                //if (isset($user['buy_time']) && $user['buy_time']>date('Y-m-d H:i:s')) $this->error('一小时取消3次以上，24小时内禁止下单');
+                if (isset($user['buy_time']) && $user['buy_time']>date('Y-m-d H:i:s')) $this->error('一小时取消3次以上，24小时内禁止下单');
 
                 //判断是否有未支付订单
                 $order_count = Db::name('store_order_info_order')->where('mid',$this->uid)->where('status',0)->count();
@@ -437,7 +437,7 @@ class Secondary extends Base
     }
 
 
-        /**
+    /**
      * @title 二级市场我的转售列表
      * @desc  二级市场我的转售列表
      * @author  Gavin
@@ -506,7 +506,7 @@ class Secondary extends Base
      * @header name:Authorization require:1 desc:Token
      * @param  name:page type:int  : default:1 desc:页数
      * @param  name:page_num type:int  : default:20 desc:每页数
-     * @param name:status type:int require:0 default:-1 desc:-1全部，0:待支付1：已购买2：转售中3：已转售
+     * @param name:status type:int require:0 default:0 desc:0:待支付1：已购买2：转售中3：已转售
      *
      * @return  name:name type:string require:0 default:0 desc:藏品名称
      * @return  name:cover type:string require:0 default:0 desc:图片
@@ -527,48 +527,48 @@ class Secondary extends Base
         $status = input('status',0);
         switch ($status){
             case 0:case 1:
-                $count =  Db::name('store_order_info_order')
-                    ->where('mid',$this->uid)
-                    ->where('status',$status)
-                    ->count();
-                $list = Db::name('store_order_info_order')
-                    ->where('mid',$this->uid)
-                    ->where('status',$status)
-                    ->order('id desc')
-                    ->limit($this->off_set,$this->page_num)
-                    ->select();
-                //自动取消分钟数
-                $cancel_time = getCancelTime();
-                foreach ($list as &$v){
-                    $v['pro_info'] = json_decode($v['pro_info'],true);
-                    $member = getMemberInfoHash($v['mid']); //获取用户信息
-                    $v['member_name'] = $member['name'];
-                    $v['member_headimg'] = $member['headimg'];
-                    if ($v['status']==0){
-                        $v['cancel_time'] = date('Y-m-d H:i:s',strtotime($v['create_at'])+($cancel_time*60));
-                    }
+            $count =  Db::name('store_order_info_order')
+                ->where('mid',$this->uid)
+                ->where('status',$status)
+                ->count();
+            $list = Db::name('store_order_info_order')
+                ->where('mid',$this->uid)
+                ->where('status',$status)
+                ->order('id desc')
+                ->limit($this->off_set,$this->page_num)
+                ->select();
+            //自动取消分钟数
+            $cancel_time = getCancelTime();
+            foreach ($list as &$v){
+                $v['pro_info'] = json_decode($v['pro_info'],true);
+                $member = getMemberInfoHash($v['mid']); //获取用户信息
+                $v['member_name'] = $member['name'];
+                $v['member_headimg'] = $member['headimg'];
+                if ($v['status']==0){
+                    $v['cancel_time'] = date('Y-m-d H:i:s',strtotime($v['create_at'])+($cancel_time*60));
                 }
-                break;
+            }
+            break;
             case 2:case 3:
-                $count = Db::name('store_order_info')
-                    ->where('mid',$this->uid)
-                    ->where('resale_status',$status)
-                    ->where('is_destruction',1)
-                    ->count();
-                $list = Db::name('store_order_info')
-                    ->where('mid',$this->uid)
-                    ->where('resale_status',$status)
-                    ->where('is_destruction',1)
-                    ->order('id desc')
-                    ->limit($this->off_set,$this->page_num)
-                    ->select();
-                foreach ($list as &$v){
-                    $v['pro_info'] = json_decode($v['pro_info'],true);
-                    $member = getMemberInfoHash($v['mid']); //获取用户信息
-                    $v['member_name'] = $member['name'];
-                    $v['member_headimg'] = $member['headimg'];
-                }
-                break;
+            $count = Db::name('store_order_info')
+                ->where('mid',$this->uid)
+                ->where('resale_status',$status)
+                ->where('is_destruction',1)
+                ->count();
+            $list = Db::name('store_order_info')
+                ->where('mid',$this->uid)
+                ->where('resale_status',$status)
+                ->where('is_destruction',1)
+                ->order('id desc')
+                ->limit($this->off_set,$this->page_num)
+                ->select();
+            foreach ($list as &$v){
+                $v['pro_info'] = json_decode($v['pro_info'],true);
+                $member = getMemberInfoHash($v['mid']); //获取用户信息
+                $v['member_name'] = $member['name'];
+                $v['member_headimg'] = $member['headimg'];
+            }
+            break;
             default:
                 $count =  Db::name('store_order_info_order')
                     ->where('mid',$this->uid)
@@ -639,6 +639,47 @@ class Secondary extends Base
         $this->success('ok',$detail);
     }
 
+    /**
+     * @title 根据藏品id获取二级市场订单【流转订单：已转售转售订单】
+     * @desc  二级市场订单
+     * @author  Qc
+     * @url /api/Secondary/getSecondaryOrderDetailByCollect
+     * @method POST
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int require:0 default:-- desc:已转售记录id
+     * @return  name:name type:string require:0 default:0 desc:藏品名称
+     * @return  name:cover type:string require:0 default:0 desc:图片
+     * @return  name:status type:int require:0 default:0 desc:0待支付,1已支付,2取消
+     * @return  name:pay_type type:string require:0 default:0 desc:支付方式：wx:微信zfb:支付宝wallet:余额，sd:杉德h5,sd_rapid:杉德快捷充值
+     * @return  name:order_no type:string require:0 default:0 desc:单号
+     * @return  name:create_at type:string require:0 default:0 desc:下单时间
+     * @return  name:pay_at type:string require:0 default:0 desc:支付时间
+     * @return  name:member_name type:string require:0 default:0 desc:买方名称
+     * @return  name:member_headimg type:string require:0 default:0 desc:买方头像
+     * @return  name:pay_price type:string require:0 default:0 desc:出售价格（已购买、待支付使用）
+     * @return  name:resale_price type:string require:0 default:0 desc:出售价格（转售中、已转售使用）
+     * @return  name:cancel_time type:string require:0 default:0 desc:取消时间
+     * @return name:pro_info@name type:string default:-- desc:藏品名称
+     * @return name:pro_info@price type:string default:-- desc:藏品价格
+     * @return name:pro_info@cover type:string default:-- desc:藏品封面
+     * @return name:pro_info@auth_img type:string default:-- desc:藏品作者头像
+     * @return name:pro_info@auth_name type:string default:-- desc:藏品作者名称
+     */
+    public function getSecondaryOrderDetailByCollect()
+    {
+        $collect_id = input('id');
+        $collect_info =  Db::name('store_order_info')->where('mid',$this->uid)
+            ->where('id',$collect_id)->where('resale_status',3)->find();
+        if(!$collect_info ) $this->error('藏品记录有误');
+        $order_info = Db::name('store_order_info_order')
+            ->where('info_id',$collect_id)->where('status',1)->find();
+        if(!$order_info) $this->error('订单不存在');
+        $member = getMemberInfoHash($order_info['mid']); //获取用户信息
+        $order_info['member_name'] = $member['name'];
+        $order_info['member_headimg'] = $member['headimg'];
+        $order_info['pro_info'] = json_decode($order_info['pro_info'],true);
+        $this->success('ok',$order_info);
+    }
 
     /**
      * @title 取消订单
@@ -724,8 +765,8 @@ class Secondary extends Base
         if (!$order_no) $this->error('参数错误');
         if (!$id) $this->error('参数错误');
         $order = Db::name('store_order_info_order')
-           // ->where('order_no',$order_no)
-           ->where('id',$id)
+            // ->where('order_no',$order_no)
+            ->where('id',$id)
             ->where('mid',$this->uid)
             ->find();
         if (!$order) $this->error('订单不存在');
@@ -840,7 +881,7 @@ class Secondary extends Base
                     $retrun_data['pay_query'] = $pay_query;
                     Db::commit();
                     break;
-                }
+            }
         }catch (\Exception $e){
             $com=false;
             $error_msg= $e->getMessage();

application/api/controller/UserCenter.php

@@ -204,9 +204,10 @@ class UserCenter extends Base
         if (!$bank_user) $this->error('姓名不能为空');
         if(check_bankCard($bank_num) != 1) $this->error('银行卡格式错误');
         $user_info = Db::name('store_member')->where('id',$this->uid)->find();
-       // if ($user_info['second_password']!=md5($pay_password)) $this->error('密码错误');
+        if ($user_info['bank_num'] == $bank_num && $user_info['bank_user'] == $bank_user) $this->error('与原绑定信息一致');
         $update_data['bank_num'] = $bank_num;
         $update_data['bank_user'] = $bank_user;
+
         if (Db::name('store_member')->where('id',$this->uid)->update($update_data)){
             setMemberInfoHash($this->uid);
             $this->success('绑定成功');
@@ -614,7 +615,7 @@ class UserCenter extends Base
             $redis->set('examples'.$this->uid,1,2);
         }
         $phone = input('phone');
-       // $wallet_address = input('wallet_address');
+        // $wallet_address = input('wallet_address');
         $second_password = input('second_password');
         if (!$id || !$phone ) $this->error('参数错误');
         $info = Db::name('store_order_info')->where('id',$id)->where('mid',$this->uid)->find();
@@ -1062,8 +1063,8 @@ class UserCenter extends Base
                 $data['real_money'] = $real_money;
                 switch ($withdraw_type){
                     case 'wx':
-                         $data['account_no'] = $user['openid'];
-                         $data['account_name']=$user['name'];
+                        $data['account_no'] = $user['openid'];
+                        $data['account_name']=$user['name'];
                         break;
                     case 'zfb':
                         $data['account_no'] = $user['zfb_account'];
@@ -1121,7 +1122,7 @@ class UserCenter extends Base
             if ($info['resale_status']!=1) $this->error('盲盒挂售中或已出售');
             $where = 'status = 1 and coll_id = '.$info['c_id'].' and is_del = 1 and residue_num > 0';
             $residue_num_all = Db::name('store_blind_box')->where($where)->sum('residue_num');
-           // if($residue_num_all <= 0 )$this->error('对不起，盲盒已没有奖品');
+            // if($residue_num_all <= 0 )$this->error('对不起，盲盒已没有奖品');
             $com = true;
             Db::startTrans();
             try {