Commit cf2eaf4e authored by xiabin's avatar xiabin

修改支付接口

parent e3f2b30f
......@@ -387,14 +387,12 @@ class HomeController extends \yii\web\Controller
$order->save();
} else {
//价格变动后给支付宝的订单编号也会变动
if ($price !== $order->credit and $order->status !== Orders::PAID) {
if ($order->status !== Orders::PAID) {
$order->credit = $price;
$order->number = $number;
$order->update();
}
}
$alipay = new AliPay();
$parameter = array(
......@@ -435,8 +433,7 @@ class HomeController extends \yii\web\Controller
$order->pay_order = '0';
$order->save();
} else {
//价格变动后给支付宝的订单编号也会变动
if ($price !== $order->credit and $order->status !== Orders::PAID) {
if ($order->status !== Orders::PAID) {
$order->credit = $price;
$order->number = $number;
$order->update();
......
......@@ -93,8 +93,6 @@ class PayController extends Controller
*/
public function actionWeixinPayCallback()
{
//获取
$data = (\Yii::$app->request->post());
$weixinpay = \Yii::$app->params['weixinpay'];
......@@ -219,7 +217,7 @@ class PayController extends Controller
]);
}
$weixinpay = \Yii::$app->params['weixinpay'];
if ($data['sign'] !== $weixinpay['key']) {
if ($data['sign'] !== WeixinPay::makeWeixinPaySign($data, $weixinpay['key'])) {
return \Yii::createObject([
'class' => 'yii\web\Response',
'format' => \yii\web\Response::FORMAT_XML,
......@@ -238,23 +236,25 @@ class PayController extends Controller
$orderId = $data['out_trade_no'];
$payOrder = $data['transaction_id'];
//修改订单状态
$order = Orders::findOne(['number' => $orderId]);
$order->status = Orders::PAID;
$order->pay_order = $payOrder;
$order->update();
//并添加消费记录
$consume = new Consume();
$consume->orders_id = $order->id;
$consume->user_id = $order->user_id;
$consume->save();
//添加收入记录
$income = new Income();
$income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$income->save();
if ($order !== NULL and $order->status !== Orders::PAID) {
//修改订单状态
$order = Orders::findOne(['number' => $orderId]);
$order->status = Orders::PAID;
$order->pay_order = $payOrder;
$order->update();
//并添加消费记录
$consume = new Consume();
$consume->orders_id = $order->id;
$consume->user_id = $order->user_id;
$consume->save();
//添加收入记录
$income = new Income();
$income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$income->save();
}
return \Yii::createObject([
'class' => 'yii\web\Response',
'format' => \yii\web\Response::FORMAT_XML,
......@@ -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