Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/factory/admin/Excel.php

@@ -121,7 +121,7 @@ class Excel extends Core
                             $v['operdate_day'],
                             $user['name'],
                             $v2['name'],
-                            $v2['num'],
+                            $v2['num'] * $v1['num'],
                             $v['order_num'],
 
                             $v['type_info']['name'],
@@ -140,8 +140,8 @@ class Excel extends Core
                         (
                             $v2['code'],
                             $v2['name'],
-                            $v2['num'],
-                            $v2['price'],
+                            $v2['num'] * $v1['num'],
+                            round($v2['price'] * $v1['num'], 2),
                         );
 
                         // $body[] = $d;
@@ -272,7 +272,7 @@ class Excel extends Core
                             '中食民安（北京）',
                             $v2['name'],
                             $v2['unit'],
-                            $v2['num'],
+                            $v2['num'] * $v1['num'],
 
                             $v['order_num'],
 
@@ -287,8 +287,8 @@ class Excel extends Core
                         (
                             $v2['code'],
                             $v2['name'],
-                            $v2['num'],
-                            $v2['price'],
+                            $v2['num'] * $v1['num'],
+                            round($v2['price'] * $v1['num'], 2),
                         );
                         // $body[] = $d;
                     }
@@ -456,15 +456,15 @@ class Excel extends Core
                             $v['order_num'],
                             $v2['code'],
                             $v2['name'],
-                            $v2['num'],
+                            $v2['num'] * $v1['num'],
                             '',
                         );
                         $body_2[] = array
                         (
                             $v2['code'],
                             $v2['name'],
-                            $v2['num'],
-                            $v2['price'],
+                            $v2['num'] * $v1['num'],
+                            round($v2['price'] * $v1['num'], 2),
                         );
                     }
                 } else {

app/factory/admin/Order.php

@@ -208,14 +208,14 @@ class Order extends Core
             $psinfo = array();
             foreach ($data as $k => $v) {
                 if ($k == 2) {
-                    $order_num = $v['B'];
+                    $order_num = $v['A'];
                     if ($order_num) {
                         $order = Dever::db('shop/buy_order')->find(array('order_num' => $order_num));
                         if ($order && $order['status'] == 3) {
                             if (!isset($psinfo[$order['id']])) {
                                 $psinfo[$order['id']] = array();
                             }
-                            $psinfo[$order['id']][] = array($v['D'], $v['N'], $v['G']);
+                            $psinfo[$order['id']][] = array($v['B'], $v['C'], $v['D']);
                         }
                     }
                 }
@@ -227,7 +227,12 @@ class Order extends Core
                     $update['order_id'] = $k;
                     $service = array();
                     foreach ($v as $k1 => $v1) {
-                        $update['cdate'] = Dever::maketime($v1[2]);
+                        if ($v1[2] && strstr($v1[2], '-')) {
+                            $update['cdate'] = Dever::maketime($v1[2]);
+                        } else {
+                            $update['cdate'] = time();
+                        }
+                        
                         $service_info = Dever::db('shop/service')->find($v1[1]);
                         if (!$service_info) {
                             $service_id = Dever::db('shop/service')->insert(array('name' => $v1[1], 'type' => 1));

app/store/admin/Order.php

@@ -216,14 +216,14 @@ class Order extends Core
             $psinfo = array();
             foreach ($data as $k => $v) {
                 if ($k == 2) {
-                    $order_num = $v['B'];
+                    $order_num = $v['A'];
                     if ($order_num) {
                         $order = Dever::db('shop/buy_order')->find(array('order_num' => $order_num));
                         if ($order && $order['status'] == 3) {
                             if (!isset($psinfo[$order['id']])) {
                                 $psinfo[$order['id']] = array();
                             }
-                            $psinfo[$order['id']][] = array($v['D'], $v['N'], $v['G']);
+                            $psinfo[$order['id']][] = array($v['B'], $v['C'], $v['D']);
                         }
                     }
                 }
@@ -235,7 +235,11 @@ class Order extends Core
                     $update['order_id'] = $k;
                     $service = array();
                     foreach ($v as $k1 => $v1) {
-                        $update['cdate'] = Dever::maketime($v1[2]);
+                        if ($v1[2] && strstr($v1[2], '-')) {
+                            $update['cdate'] = Dever::maketime($v1[2]);
+                        } else {
+                            $update['cdate'] = time();
+                        }
                         $service_info = Dever::db('shop/service')->find($v1[1]);
                         if (!$service_info) {
                             $service_id = Dever::db('shop/service')->insert(array('name' => $v1[1], 'type' => 1));