Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
e3f2b30f
Commit
e3f2b30f
authored
Oct 19, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付逻辑
parent
33c0e925
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
6 deletions
+24
-6
HomeController.php
src/frontend/controllers/HomeController.php
+23
-4
PayController.php
src/frontend/controllers/PayController.php
+0
-1
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+1
-1
No files found.
src/frontend/controllers/HomeController.php
View file @
e3f2b30f
...
@@ -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
(
'参数错误'
);
}
}
...
...
src/frontend/controllers/PayController.php
View file @
e3f2b30f
...
@@ -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'
,
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
e3f2b30f
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
<a href="
javascript
:;
" @click="
showQrcode
=
false
"> < 返回支付渠道选择</a>
<a href="
javascript
:;
" @click="
showQrcode
=
false
"> < 返回支付渠道选择</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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment