edit

app/factory/admin/Order.php

@@ -295,10 +295,10 @@ class Order extends Core
             }
         }
         $update = array();
-        $update['order_id'] = $order_id;
         if ($service) {
-            $update['service'] = $service;
+            $update = $service;
         }
+        $update['order_id'] = $order_id;
         
         $update['cdate'] = $input['update_cdate'];
         /*

app/mshop/lib/Buy.php

@@ -291,6 +291,9 @@ class Buy
             $info['ps_info']['status_name'] = $status[$info['ps_info']['status']];
             
             if ($info['ps_info']['service']) {
+                if (isset($info['ps_info']['service']['serivce'])) {
+                    $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                }
                 foreach ($info['ps_info']['service'] as $k => $v) {
                     if (isset($v['order_num']) && $v['order_num']) {
                         $info['ps_info']['service'][$k]['service_name'] = '供应商自送';
@@ -324,8 +327,11 @@ class Buy
 
         $refund_time = $manage_config['buy_refund_day']*86400;
 
-        if ($refund_time > 0 && ($info['status'] == 8 || $info['status'] == 6)) {
+        if ($refund_time > 0 && ($info['status'] == 5 || $info['status'] == 6)) {
             $cur = time();
+            if (strstr($info['fdate'], '-')) {
+                $info['fdate'] = Dever::maketime($info['fdate']);
+            }
             if ($cur - $info['fdate'] < $refund_time) {
                 # 可以退款
                 $info['refund_button'] = 1;
@@ -1220,6 +1226,9 @@ class Buy
             
             $service = array();
             if ($info['ps_info']['service']) {
+                if (isset($info['ps_info']['service']['serivce'])) {
+                    $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                }
                 foreach ($info['ps_info']['service'] as $k => $v) {
                     if (isset($v['order_num']) && $v['order_num']) {
                         $info['ps_info']['service'][$k]['service_name'] = '供应商自送';
@@ -2329,6 +2338,9 @@ class Buy
             }
             
             if ($info['ps_info'] && $info['ps_info']['service']) {
+                if (isset($info['ps_info']['service']['serivce'])) {
+                    $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                }
                 foreach ($info['ps_info']['service'] as $k => $v) {
                     if (isset($v['order_num']) && $v['order_num']) {
                         $info['ps_info']['service'][$k]['service_name'] = '供应商自送';
@@ -2397,6 +2409,9 @@ class Buy
             $pdf->hr();
 
             if ($info['ps_info'] && $info['ps_info']['service']) {
+                if (isset($info['ps_info']['service']['serivce'])) {
+                    $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                }
                 $pdf->br()->left('发货时间：' . $info['ps_info']['cdate'], 80)->left('收货时间：' . $info['ps_info']['ydate'], 80);
 
                 foreach ($info['ps_info']['service'] as $k => $v) {

app/shop/lib/Sell.php

@@ -267,6 +267,9 @@ class Sell
                 $status = Dever::db('shop/sell_order_ps')->config['status'];
                 $info['ps_info']['status_name'] = $status[$info['ps_info']['status']];
                 if ($info['ps_info']['service']) {
+                    if (isset($info['ps_info']['service']['serivce'])) {
+                        $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                    }
                     foreach ($info['ps_info']['service'] as $k => $v) {
                         if (isset($v['order_num']) && $v['order_num']) {
                             $info['ps_info']['service'][$k]['service_name'] = '商家自送';
@@ -390,8 +393,11 @@ class Sell
             $refund_time = $manage_config['sell_refund_day']*86400;
         }
 
-        if ($refund_time > 0 && ($info['status'] == 8 || $info['status'] == 6)) {
+        if ($refund_time > 0 && ($info['status'] == 5 || $info['status'] == 6)) {
             $cur = time();
+            if (strstr($info['fdate'], '-')) {
+                $info['fdate'] = Dever::maketime($info['fdate']);
+            }
             if ($cur - $info['fdate'] < $refund_time) {
                 # 可以退款
                 $info['refund_button'] = 1;
@@ -2004,6 +2010,9 @@ class Sell
             
             $service = array();
             if ($info['ps_info']['service']) {
+                if (isset($info['ps_info']['service']['serivce'])) {
+                    $info['ps_info']['service'] = $info['ps_info']['service']['service'];
+                }
                 foreach ($info['ps_info']['service'] as $k => $v) {
                     if (isset($v['order_num']) && $v['order_num']) {
                         $info['ps_info']['service'][$k]['service_name'] = '';

app/store/admin/Order.php

@@ -298,10 +298,10 @@ class Order extends Core
             }
         }
         $update = array();
-        $update['order_id'] = $order_id;
         if ($service) {
-            $update['service'] = $service;
+            $update = $service;
         }
+        $update['order_id'] = $order_id;
         
         $update['cdate'] = $input['update_cdate'];
         /*