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
22800361
Commit
22800361
authored
Feb 16, 2019
by
chenchuanwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
address
parent
12431cf2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
Common.php
application/library/Our/Common.php
+1
-1
RefundService.php
application/models/Business/Order/RefundService.php
+0
-1
No files found.
application/library/Our/Common.php
View file @
22800361
...
...
@@ -314,7 +314,7 @@ public static function convertArrKey($arr, $key_name)
public
static
function
getRealStr
(
$originStr
)
{
$result
=
str_replace
(
array
(
"
\r\n
"
,
"
\r
"
,
"
\n
"
),
""
,
$originStr
);
$result
=
str_replace
(
array
(
"
\r\n
"
,
"
\r
"
,
"
\n
"
,
"
\t
"
),
""
,
$originStr
);
$result
=
trim
(
$result
);
return
$result
;
}
...
...
application/models/Business/Order/RefundService.php
View file @
22800361
...
...
@@ -1436,7 +1436,6 @@ class RefundServiceModel extends \Business\AbstractModel
$orderCommon
=
$orderDao
->
getClienOrderCommon
(
$order
);
$info
=
array_merge
(
$info
,
$orderCommon
);
}
echo
json_encode
(
$info
);
exit
;
if
(
!
$refundReturn
)
{
ErrorModel
::
throwException
(
CodeConfigModel
::
orderError
);
}
else
{
...
...
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