Skip to content

M
my-yaf-project
Commit 22800361 authored by chenchuanwen's avatar chenchuanwen
Browse files
Options

address

parent 12431cf2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
application/library/Our/Common.php
View file @ 22800361
...@@ -314,7 +314,7 @@ public static function convertArrKey($arr, $key_name) ...@@ -314,7 +314,7 @@ public static function convertArrKey($arr, $key_name)
public static function getRealStr($originStr) 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); $result = trim($result);
return $result; return $result;
} }
......
application/models/Business/Order/RefundService.php
View file @ 22800361
...@@ -1436,7 +1436,6 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -1436,7 +1436,6 @@ class RefundServiceModel extends \Business\AbstractModel
$orderCommon=$orderDao->getClienOrderCommon($order); $orderCommon=$orderDao->getClienOrderCommon($order);
$info=array_merge($info,$orderCommon); $info=array_merge($info,$orderCommon);
} }
echo json_encode($info);exit;
if (!$refundReturn) { if (!$refundReturn) {
ErrorModel::throwException(CodeConfigModel::orderError); ErrorModel::throwException(CodeConfigModel::orderError);
} else { } else {
......
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