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
c1fe5a73
Commit
c1fe5a73
authored
Nov 25, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试数据
parent
877e6453
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
WxPay.php
application/library/Payment/WxPay.php
+1
-3
RefundReturn.php
application/models/DAO/Order/RefundReturn.php
+1
-1
No files found.
application/library/Payment/WxPay.php
View file @
c1fe5a73
...
@@ -104,15 +104,13 @@ class WxPay extends \Payment\TencentPay
...
@@ -104,15 +104,13 @@ class WxPay extends \Payment\TencentPay
{
{
$total_fee
=
intval
(
$param
[
'totalFee'
]);
$total_fee
=
intval
(
$param
[
'totalFee'
]);
$refund_fee
=
intval
(
$param
[
'refundFee'
]);
$refund_fee
=
intval
(
$param
[
'refundFee'
]);
if
(
APP_ENV
==
'develop'
||
APP_ENV
==
'test'
||
APP_ENV
==
'pre'
||
APP_ENV
==
'ccwdevelop'
){
if
(
APP_ENV
==
'develop'
||
APP_ENV
==
'test'
||
APP_ENV
==
'pre'
||
APP_ENV
==
'ccwdevelop'
||
APP_ENV
==
'lyztest'
){
$this
->
parameters
[
'total_fee'
]
=
1
;
$this
->
parameters
[
'total_fee'
]
=
1
;
$this
->
parameters
[
'refund_fee'
]
=
1
;
$this
->
parameters
[
'refund_fee'
]
=
1
;
}
else
{
}
else
{
$this
->
parameters
[
'total_fee'
]
=
$total_fee
;
$this
->
parameters
[
'total_fee'
]
=
$total_fee
;
$this
->
parameters
[
'refund_fee'
]
=
$refund_fee
;
$this
->
parameters
[
'refund_fee'
]
=
$refund_fee
;
}
}
$this
->
parameters
[
'total_fee'
]
=
$total_fee
;
$this
->
parameters
[
'refund_fee'
]
=
$refund_fee
;
$this
->
parameters
[
'out_refund_no'
]
=
$param
[
'refundOrderNo'
];
$this
->
parameters
[
'out_refund_no'
]
=
$param
[
'refundOrderNo'
];
$this
->
parameters
[
'out_trade_no'
]
=
$param
[
'outTradeNo'
];
$this
->
parameters
[
'out_trade_no'
]
=
$param
[
'outTradeNo'
];
$this
->
parameters
[
'op_user_id'
]
=
$this
->
mch_id
;
$this
->
parameters
[
'op_user_id'
]
=
$this
->
mch_id
;
...
...
application/models/DAO/Order/RefundReturn.php
View file @
c1fe5a73
...
@@ -396,7 +396,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
...
@@ -396,7 +396,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
}
}
$param
[
'subMchId'
]
=
$mchIdArray
[
'mchId'
];
$param
[
'subMchId'
]
=
$mchIdArray
[
'mchId'
];
}
}
if
(
intval
(
$orderInfo
[
'paymentType'
])
==
ApiConst
::
wxAppPayType
)
{
if
(
intval
(
$orderInfo
[
'paymentType'
])
==
ApiConst
::
wxAppPayType
||
intval
(
$orderInfo
[
'paymentType'
])
==
3
)
{
$wxpay
=
\Payment\WxPay
::
getInstance
();
$wxpay
=
\Payment\WxPay
::
getInstance
();
unset
(
$param
[
'subMchId'
]);
unset
(
$param
[
'subMchId'
]);
$refund_return
=
$wxpay
->
refund
(
$param
);
$refund_return
=
$wxpay
->
refund
(
$param
);
...
...
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