Commit e3f2b30f authored by xiabin's avatar xiabin

修改支付逻辑

parent 33c0e925
...@@ -387,7 +387,7 @@ class HomeController extends \yii\web\Controller ...@@ -387,7 +387,7 @@ class HomeController extends \yii\web\Controller
$order->save(); $order->save();
} else { } else {
//价格变动后给支付宝的订单编号也会变动 //价格变动后给支付宝的订单编号也会变动
if ($price !== $order->credit) { 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();
...@@ -418,13 +418,32 @@ class HomeController extends \yii\web\Controller ...@@ -418,13 +418,32 @@ class HomeController extends \yii\web\Controller
public public
function actionWeixinPayQrcode($courseId) function actionWeixinPayQrcode($courseId)
{ {
$userId = Yii::$app->user->identity->getId();
$courseBaseInfo = Course::findBaseInfoByCourseId($courseId); $courseBaseInfo = Course::findBaseInfoByCourseId($courseId);
if ($courseBaseInfo !== NULL) { if ($courseBaseInfo !== NULL) {
$userId = Yii::$app->user->identity->getId();
$order = Orders::findByUserIdAndCourseId($userId, $courseId);
$price = $courseBaseInfo['price']; $price = $courseBaseInfo['price'];
$productId = $this->generateOrderNumber($userId, $courseId, $price); $number = $this->generateOrderNumber($userId, $courseId, $price);
//判断订单是否存在
if ($order === NULL) {
$order = new Orders();
$order->user_id = $userId;
$order->course_id = $courseId;
$order->number = $number;
$order->credit = $price;
$order->status = Orders::UNPAID;
$order->pay_order = '0';
$order->save();
} else {
//价格变动后给支付宝的订单编号也会变动
if ($price !== $order->credit and $order->status !== Orders::PAID) {
$order->credit = $price;
$order->number = $number;
$order->update();
}
}
$weixinPay = WeixinPay::getInstance(); $weixinPay = WeixinPay::getInstance();
return QrCode::jpg($weixinPay->makePayUrl($productId)); return QrCode::jpg($weixinPay->makePayUrl($number));
} else { } else {
throw new InvalidParamException('参数错误'); throw new InvalidParamException('参数错误');
} }
......
...@@ -177,7 +177,6 @@ class PayController extends Controller ...@@ -177,7 +177,6 @@ class PayController extends Controller
'sign' => '' 'sign' => ''
]; ];
$return['sign'] = WeixinPay::makeWeixinPaySign($return, $weixinpay['key']); $return['sign'] = WeixinPay::makeWeixinPaySign($return, $weixinpay['key']);
//生成订单数据
return \Yii::createObject([ return \Yii::createObject([
'class' => 'yii\web\Response', 'class' => 'yii\web\Response',
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<a href="javascript:;" @click="showQrcode = false"> &lt; 返回支付渠道选择</a> <a href="javascript:;" @click="showQrcode = false"> &lt; 返回支付渠道选择</a>
</div> </div>
<div class="qrcode-img"> <div class="qrcode-img">
<img :src="getWeixinPayQrcode(coursewareInfo.course_id)"> <img v-if="showQrcode" :src="getWeixinPayQrcode(coursewareInfo.course_id)">
<p>请使用微信扫一扫付款</p> <p>请使用微信扫一扫付款</p>
</div> </div>
</div> </div>
......
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