Commit cf2eaf4e authored by xiabin's avatar xiabin

修改支付接口

parent e3f2b30f
...@@ -387,14 +387,12 @@ class HomeController extends \yii\web\Controller ...@@ -387,14 +387,12 @@ class HomeController extends \yii\web\Controller
$order->save(); $order->save();
} else { } else {
//价格变动后给支付宝的订单编号也会变动 //价格变动后给支付宝的订单编号也会变动
if ($price !== $order->credit and $order->status !== Orders::PAID) { if ($order->status !== Orders::PAID) {
$order->credit = $price; $order->credit = $price;
$order->number = $number; $order->number = $number;
$order->update(); $order->update();
} }
} }
$alipay = new AliPay(); $alipay = new AliPay();
$parameter = array( $parameter = array(
...@@ -435,8 +433,7 @@ class HomeController extends \yii\web\Controller ...@@ -435,8 +433,7 @@ class HomeController extends \yii\web\Controller
$order->pay_order = '0'; $order->pay_order = '0';
$order->save(); $order->save();
} else { } else {
//价格变动后给支付宝的订单编号也会变动 if ($order->status !== Orders::PAID) {
if ($price !== $order->credit and $order->status !== Orders::PAID) {
$order->credit = $price; $order->credit = $price;
$order->number = $number; $order->number = $number;
$order->update(); $order->update();
......
...@@ -93,8 +93,6 @@ class PayController extends Controller ...@@ -93,8 +93,6 @@ class PayController extends Controller
*/ */
public function actionWeixinPayCallback() public function actionWeixinPayCallback()
{ {
//获取 //获取
$data = (\Yii::$app->request->post()); $data = (\Yii::$app->request->post());
$weixinpay = \Yii::$app->params['weixinpay']; $weixinpay = \Yii::$app->params['weixinpay'];
...@@ -219,7 +217,7 @@ class PayController extends Controller ...@@ -219,7 +217,7 @@ class PayController extends Controller
]); ]);
} }
$weixinpay = \Yii::$app->params['weixinpay']; $weixinpay = \Yii::$app->params['weixinpay'];
if ($data['sign'] !== $weixinpay['key']) { if ($data['sign'] !== WeixinPay::makeWeixinPaySign($data, $weixinpay['key'])) {
return \Yii::createObject([ return \Yii::createObject([
'class' => 'yii\web\Response', 'class' => 'yii\web\Response',
'format' => \yii\web\Response::FORMAT_XML, 'format' => \yii\web\Response::FORMAT_XML,
...@@ -238,23 +236,25 @@ class PayController extends Controller ...@@ -238,23 +236,25 @@ class PayController extends Controller
$orderId = $data['out_trade_no']; $orderId = $data['out_trade_no'];
$payOrder = $data['transaction_id']; $payOrder = $data['transaction_id'];
//修改订单状态
$order = Orders::findOne(['number' => $orderId]); $order = Orders::findOne(['number' => $orderId]);
$order->status = Orders::PAID; if ($order !== NULL and $order->status !== Orders::PAID) {
$order->pay_order = $payOrder; //修改订单状态
$order->update(); $order = Orders::findOne(['number' => $orderId]);
//并添加消费记录 $order->status = Orders::PAID;
$consume = new Consume(); $order->pay_order = $payOrder;
$consume->orders_id = $order->id; $order->update();
$consume->user_id = $order->user_id; //并添加消费记录
$consume->save(); $consume = new Consume();
//添加收入记录 $consume->orders_id = $order->id;
$income = new Income(); $consume->user_id = $order->user_id;
$income->orders_id = $order->id; $consume->save();
$courseInfo = Course::findBaseInfoByCourseId($order->course_id); //添加收入记录
$income->user_id = $courseInfo['user_id']; $income = new Income();
$income->save(); $income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$income->save();
}
return \Yii::createObject([ return \Yii::createObject([
'class' => 'yii\web\Response', 'class' => 'yii\web\Response',
'format' => \yii\web\Response::FORMAT_XML, 'format' => \yii\web\Response::FORMAT_XML,
...@@ -272,5 +272,3 @@ class PayController extends Controller ...@@ -272,5 +272,3 @@ class PayController extends Controller
} }
} }
opcache_invalidate(__FILE__);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment