add usepred for step_second

helper/pay_helper.php

@@ -53,17 +53,16 @@ class pay_helper
         $this->mPaysn = $paysn;
     }
 
-    public function pay($payment,$usebonus,$usepred,&$err)
+    public function pay($payment,&$err)
     {
-        $usebonus = false;
         if($this->mOrderType == self::real_order) {
-            return $this->real_pay($payment,$usebonus,$usepred,$err);
+            return $this->real_pay($payment,$err);
         } else {
-            return $this->virtual_pay($payment,$usebonus,$usepred,$err);
+            return $this->virtual_pay($payment,$err);
         }
     }
 
-    private function real_pay($payment,$usebonus,$usepred,&$err)
+    private function real_pay($payment,&$err)
     {
         $pay_sn = $this->mPaysn;
         $payinfo = $this->mPaymentLogic->getRealOrderInfo($pay_sn, $_SESSION['member_id'],true);
@@ -101,7 +100,7 @@ class pay_helper
         }
     }
 
-    private function virtual_pay($payment,$usebonus,$usepred,&$err)
+    private function virtual_pay($payment,&$err)
     {
         $order_sn = $this->mPaysn;
         $payinfo = $this->mPaymentLogic->getVrOrderInfo($order_sn, null,true);

mobile/control/member_buy.php

@@ -142,30 +142,20 @@ class member_buyControl extends mbMemberControl
         $param['cart_id'] = $this->pay_goods($cart_ids);
         $param['address_id'] = $_POST['address_id'];
         $param['invoice_id'] = $_POST['invoice_id'];
-
         $param['vat_hash'] = $_POST['vat_hash'];
         $param['offpay_hash'] = $_POST['offpay_hash'];
         $param['offpay_hash_batch'] = $_POST['offpay_hash_batch'];
 
         $param['voucher'] = array();
-        //手机端暂时不做支付留言，页面内容太多了
-        //$param['pay_message'] = json_decode($_POST['pay_message']);
         $param['pd_pay'] = 0;
         $param['rcb_pay'] = 0;
         $param['password'] = "";
         $param['fcode'] = "";
         $param['order_from'] = 2; //从手机来
         $param['pay_name'] = "online";
-
         $param['usebonus'] = $_POST['usebonus'];
-        $param['pd_pay']   = $_POST['usepred'];
-
+        $param['pd_pay']   = empty($_POST['usepred']) ? 0 : 1;
         $param['room_id'] = $_POST['room_id'];
-        $usebonus = $_POST['usebonus'];
-
-        $_POST['pd_pay'] = 1;
-        $usepred  = $_POST['pd_pay'];
-        $param['pd_pay'] = 1;
 
         $logic_buy = logic('buy');
         $result = $logic_buy->buyStep2($param, $_SESSION['member_id'], $_SESSION['member_name'], $_SESSION['member_email']);
@@ -178,7 +168,7 @@ class member_buyControl extends mbMemberControl
             $payment = $_POST['payment'];
 
             $payer = new pay_helper($pay_sn);
-            $out_put = $payer->pay($payment,$usebonus,$usepred,$err);
+            $out_put = $payer->pay($payment,$err);
 
             if($out_put == false) {
                 return self::outerr($err['code'],$err['msg']);

mobile/control/member_order.php

@@ -136,7 +136,7 @@ class member_orderControl extends mbMemberControl
         }
 
         $payer = new pay_helper($pay_sn);
-        $out_put = $payer->pay($payment,false,true,$err);
+        $out_put = $payer->pay($payment,$err);
 
         if($out_put == false) {
             return self::outerr($err['code'],$err['msg']);

mobile/control/member_vorder.php

@@ -95,7 +95,7 @@ class member_vorderControl extends mbMemberControl
         }
 
         $payer = new pay_helper($pay_sn);
-        $out_put = $payer->pay($payment,false,true,$err);
+        $out_put = $payer->pay($payment,$err);
 
         if($out_put == false) {
             return self::outerr($err['code'],$err['msg']);