Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
125b3068
Commit
125b3068
authored
Jan 02, 2019
by
chenchuanwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
programliterefund
parent
d702c0d8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
WxLitePay.php
application/library/Payment/WxLitePay.php
+2
-2
OrderService.php
application/models/Business/Order/OrderService.php
+1
-1
RefundReturn.php
application/models/DAO/Order/RefundReturn.php
+0
-1
No files found.
application/library/Payment/WxLitePay.php
View file @
125b3068
...
@@ -61,9 +61,9 @@ class WxLitePay extends \Payment\TencentPay{
...
@@ -61,9 +61,9 @@ class WxLitePay extends \Payment\TencentPay{
public
function
refund
(
$param
){
public
function
refund
(
$param
){
if
(
$param
[
'subMchId'
]){
if
(
$param
[
'subMchId'
]){
$this
->
refundService
(
$param
);
return
$this
->
refundService
(
$param
);
}
else
{
}
else
{
$this
->
refundCommon
(
$param
);
return
$this
->
refundCommon
(
$param
);
}
}
}
}
...
...
application/models/Business/Order/OrderService.php
View file @
125b3068
...
@@ -455,7 +455,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -455,7 +455,7 @@ class OrderServiceModel extends \Business\AbstractModel
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$storeDao
=
\DAO\StoreModel
::
getInstance
();
//判断订单目前状态是否允许取消
//判断订单目前状态是否允许取消
$isAllowCancel
=
$orderDao
->
isAllowCancel
(
$order
);
$isAllowCancel
=
$orderDao
->
isAllowCancel
(
$order
);
//$isAllowCance
= true;
$isAllowCancel
=
true
;
if
(
$isAllowCancel
)
{
if
(
$isAllowCancel
)
{
$orderDao
->
db
->
doTransaction
();
$orderDao
->
db
->
doTransaction
();
$res
=
$orderDao
->
updateStatusByOrderId
(
$orderId
,
ApiConst
::
orderStateCancel
,
false
,
ApiConst
::
cancelOrderBySelf
);
$res
=
$orderDao
->
updateStatusByOrderId
(
$orderId
,
ApiConst
::
orderStateCancel
,
false
,
ApiConst
::
cancelOrderBySelf
);
...
...
application/models/DAO/Order/RefundReturn.php
View file @
125b3068
...
@@ -505,7 +505,6 @@ class RefundReturnModel extends \DAO\AbstractModel
...
@@ -505,7 +505,6 @@ class RefundReturnModel extends \DAO\AbstractModel
}
else
if
(
intval
(
$orderInfo
[
'paymentType'
])
==
ApiConst
::
wxProgram
)
{
}
else
if
(
intval
(
$orderInfo
[
'paymentType'
])
==
ApiConst
::
wxProgram
)
{
$wxpay
=
\Payment\WxLitePay
::
getInstance
();
$wxpay
=
\Payment\WxLitePay
::
getInstance
();
$refund_return
=
$wxpay
->
refund
(
$param
);
$refund_return
=
$wxpay
->
refund
(
$param
);
if
(
!
(
$refund_return
[
'return_code'
]
==
'SUCCESS'
&&
$refund_return
[
'result_code'
]
==
'SUCCESS'
))
{
if
(
!
(
$refund_return
[
'return_code'
]
==
'SUCCESS'
&&
$refund_return
[
'result_code'
]
==
'SUCCESS'
))
{
$this
->
errorMessage
=
date
(
'Y-m-d'
)
.
'微信退款操作执行失败!'
.
$orderInfo
[
'orderId'
]
.
"
\r\n
"
;
$this
->
errorMessage
=
date
(
'Y-m-d'
)
.
'微信退款操作执行失败!'
.
$orderInfo
[
'orderId'
]
.
"
\r\n
"
;
return
false
;
return
false
;
...
...
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