edit

app/mshop/lib/Buy.php

@@ -197,6 +197,8 @@ class Buy
             
             if ($info['ps_info']['service_id'] > 0) {
                 //暂时还没有
+                $service = Dever::db('shop/service')->find($info['ps_info']['service_id']);
+                $info['ps_info']['service_name'] = $service['name'];
             }
         }
 
@@ -560,6 +562,29 @@ class Buy
               <td>'.$this->table(array('金额', '数量', '订单状态'), array(array($info['price'], $info['num'], $status))).'</td>
             </tr>';
         }
+
+        $info['ps_info'] = Dever::db('shop/buy_order_ps')->find(array('order_id' => $info['id']));
+        if ($info['ps_info']) {
+            $info['ps_info']['service_name'] = '商家自送';
+            $info['ps_info']['cdate'] = date('Y-m-d H:i', $info['ps_info']['cdate']);
+            if ($info['ps_info']['ydate']) {
+                $info['ps_info']['ydate'] = date('Y-m-d H:i', $info['ps_info']['ydate']);
+            }
+
+            $status = Dever::db('shop/buy_order_ps')->config['status'];
+            $info['ps_info']['status_name'] = $status[$info['ps_info']['status']];
+            
+            if ($info['ps_info']['service_id'] > 0) {
+                //暂时还没有
+                $service = Dever::db('shop/service')->find($info['ps_info']['service_id']);
+                $info['ps_info']['service_name'] = $service['name'];
+            }
+
+            $html .= '<tr>
+              <td>配送信息</td>
+              <td>'.$this->table(array('名称', '单号', '费用', '数量', '重量', '体积', '配货员', '打包员', '状态'), array(array($info['ps_info']['service_name'], $info['ps_info']['order_num'], $info['ps_info']['price'], $info['ps_info']['num'], $info['ps_info']['zl'], $info['ps_info']['tj'], $info['ps_info']['phy'], $info['ps_info']['dby'], $info['ps_info']['status_name']))).'</td>
+            </tr>';
+        }
         
 
         $html .= '</tbody></table>';