合并分支 'heshupeng' 到 'master'

支付去掉测试



查看合并请求 !227

@@ -807,7 +807,7 @@ class Company extends Api
         }
         //回调链接
         $notifyurl = $this->request->root(true) . '/mobile/notify/notifyPackage/paytype/' . $param['pay_type'];
-        $model['pay_price'] = 0.01; //测试金额
+        // $model['pay_price'] = 0.01; //测试金额
         $payment = Service::submitOrder($model['pay_price'], $model['order_sn'], $param['pay_type'], '企业套餐', $notifyurl, null, 'app');
         $this->success('成功',$payment);
     }

@@ -606,7 +606,7 @@ class Course extends Api
         }
         //回调链接
         $notifyurl = $this->request->root(true) . '/mobile/notify/notifyCourse/paytype/' . $param['pay_type'];
-        $model['pay_price'] = 0.01; //测试金额
+        // $model['pay_price'] = 0.01; //测试金额
         $payment = Service::submitOrder($model['pay_price'], $model['order_sn'], $param['pay_type'], '课程', $notifyurl, null, 'app');
         $this->success('成功',$payment);
     }

@@ -72,8 +72,8 @@ class Notify extends Api
      */
     private function handleCourseOrder($out_trade_no,$payamount,$paytype){
         // 处理订单逻辑
-//        $order = CourseOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
-        $order = CourseOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
+        $order = CourseOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
+//        $order = CourseOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
         if($order && $order['pay_status'] != '1'){
             $order->save(['pay_status'=>'1','pay_time'=>time()]);
             // 学习人数加1
@@ -131,8 +131,8 @@ class Notify extends Api
      */
     private function handleSecretOrder($out_trade_no,$payamount,$paytype){
         // 处理订单逻辑
-//        $order = SecretOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
-        $order = SecretOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
+        $order = SecretOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
+//        $order = SecretOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
         if($order && $order['pay_status'] != '1'){
             $order->save(['pay_status'=>'1','pay_time'=>time()]);
             // 购买量加1
@@ -190,8 +190,8 @@ class Notify extends Api
      */
     private function handleScoreOrder($out_trade_no,$payamount,$paytype){
         // 处理订单逻辑
-//        $order = ScoreOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
-        $order = ScoreOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
+        $order = ScoreOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
+//        $order = ScoreOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
         if($order && $order['pay_status'] != '1'){
             $order->save(['pay_status'=>'1','pay_time'=>time()]);
             // 增加积分
@@ -249,8 +249,8 @@ class Notify extends Api
      */
     private function handlePackageOrder($out_trade_no,$payamount,$paytype){
         // 处理订单逻辑
-//        $order = PackageOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
-        $order = PackageOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
+        $order = PackageOrder::get(['order_sn'=>$out_trade_no,'pay_price'=>$payamount,'pay_type'=>$paytype]);
+//        $order = PackageOrder::get(['order_sn'=>$out_trade_no,'pay_type'=>$paytype]);
         if($order && $order['pay_status'] != '1'){
             $order->save(['pay_status'=>'1','pay_time'=>time()]);
             foreach ($order['package'] as $v){

@@ -360,7 +360,7 @@ class Secret extends Api
         }
         //回调链接
         $notifyurl = $this->request->root(true) . '/mobile/notify/notifySecret/paytype/' . $param['pay_type'];
-        $model['pay_price'] = 0.01; //测试金额
+        // $model['pay_price'] = 0.01; //测试金额
         $payment = Service::submitOrder($model['pay_price'], $model['order_sn'], $param['pay_type'], '密卷', $notifyurl, null, 'app');
         $this->success('成功',$payment);
     }

@@ -1382,7 +1382,7 @@ class User extends Api
         }
         //回调链接
         $notifyurl = $this->request->root(true) . '/mobile/notify/notifyScore/paytype/' . $param['pay_type'];
-        $model['pay_price'] = 0.01; //测试金额
+        // $model['pay_price'] = 0.01; //测试金额
         $payment = Service::submitOrder($model['pay_price'], $model['order_sn'], $param['pay_type'], '积分', $notifyurl, null, 'app');
         $this->success('成功',$payment);
     }