Index: temp/trunk/html/admin/order/edit.php
===================================================================
--- temp/trunk/html/admin/order/edit.php	(revision 2595)
+++ temp/trunk/html/admin/order/edit.php	(revision 2596)
@@ -264,9 +264,4 @@
 	}
 	
-	$sqlval['payment_method'] = "";
-	$sqlval['deliv_time'] = "";
-	
-	sfprintr($_POST);
-	
 	unset($sqlval['total_point']);
 	unset($sqlval['point']);
@@ -282,4 +277,14 @@
 	// ¼õÃí¥Æ¡¼¥Ö¥ë¤Î¹¹¿·
 	$objQuery->update("dtb_order", $sqlval, $where, array($order_id), $addcol);
+
+	$sql = "";
+	$sql .= " UPDATE";
+	$sql .= "     dtb_order";
+	$sql .= " SET";
+	$sql .= "     payment_method = (SELECT payment_method FROM dtb_payment WHERE payment_id = ?)";
+	$sql .= "     ,deliv_data = (SELECT time FROM dtb_deliv_time WHERE time_id = ? deliv_id = (SELECT deliv_id FROM dtb_order WHERE order_id = ?))";
+	$sql .= " ";
+	$arrUpdData = array($sqlval['payment_id'], $sqlval['deliv_time_id'], $sqlval['order_id']);
+	$objQuery->query($sql, $arrUpdData);
 	
 	// ¼õÃí¾ÜºÙ¥Ç¡¼¥¿¤Î¹¹¿·