chenchao / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit 73acad6c675073201131f7261426e14642ade97d 2 parents e142ad06 ddd24f44

Merge branch 'hotfix/returnsBug'

Inline Side-by-side
Showing 1 changed file with 12 additions and 12 deletions
@@ -500,12 +500,12 @@ class ReturnsModel @@ -500,12 +500,12 @@ class ReturnsModel
500 if (empty($order)) { 500 if (empty($order)) {
501 return array('code'=>403,'message'=>'没有找到该订单'); 501 return array('code'=>403,'message'=>'没有找到该订单');
502 } 502 }
503 - //订单7天后不能退款  
504 - if (isset($order['code']) && $order['code'] == 200) {  
505 - if ((time() - $order['data']['create_time']) > 7*86400) {  
506 - return array('code'=>400,'message'=>'您的订单已经超过了退货有效期');  
507 - }  
508 - } 503 +// //订单7天后不能退款
  504 +// if (isset($order['code']) && $order['code'] == 200) {
  505 +// if ((time() - $order['data']['create_time']) > 7*86400) {
  506 +// return array('code'=>400,'message'=>'您的订单已经超过了退货有效期');
  507 +// }
  508 +// }
509 //组装站内信内容 509 //组装站内信内容
510 $title = '您有一笔订单提交退货申请:'; 510 $title = '您有一笔订单提交退货申请:';
511 $content = '您的订单' . $orderCode . '申请退货，给您带来不便敬请谅解!请至订单中心查看详情!'; 511 $content = '您的订单' . $orderCode . '申请退货，给您带来不便敬请谅解!请至订单中心查看详情!';
@@ -540,12 +540,12 @@ class ReturnsModel @@ -540,12 +540,12 @@ class ReturnsModel
540 if (empty($order)) { 540 if (empty($order)) {
541 return array('code'=>403,'message'=>'没有找到该订单'); 541 return array('code'=>403,'message'=>'没有找到该订单');
542 } 542 }
543 - //订单15天后不能换货  
544 - if (isset($order['code']) && $order['code'] == 200) {  
545 - if ((time() - $order['data']['create_time']) > 15*86400) {  
546 - return array('code'=>400,'message'=>'您的订单已经超过了换货有效期');  
547 - }  
548 - } 543 +// //订单15天后不能换货
  544 +// if (isset($order['code']) && $order['code'] == 200) {
  545 +// if ((time() - $order['data']['create_time']) > 15*86400) {
  546 +// return array('code'=>400,'message'=>'您的订单已经超过了换货有效期');
  547 +// }
  548 +// }
549 549
550 //保存换货申请 550 //保存换货申请
551 $result = ReturnsData::exchangeSubmit($orderCode, $uid, $goods, $consigneeName, $areaCode, $address, $mobile, $zipCode, $deliveryType); 551 $result = ReturnsData::exchangeSubmit($orderCode, $uid, $goods, $consigneeName, $areaCode, $address, $mobile, $zipCode, $deliveryType);