edit

app/factory/admin/Order.php

@@ -328,7 +328,7 @@ class Order extends Core
         } else {
             Dever::db('shop/buy_order_ps')->insert($update);
         }
-        Dever::db('shop/buy_order')->update(array('status' => 4, 'where_id' => $update['order_id']));
+        Dever::db('shop/buy_order')->update(array('status' => 4, 'where_id' => $update['order_id'],'fadate'=>time()));
 
         # 检测是否是关联订单
         $order = Dever::db('shop/buy_order')->find($update['order_id']);

app/shop/database/buy_order.php

@@ -450,6 +450,18 @@ $struct = array
         'desc'      => '',
     ),
 
+    'fadate'     => array
+    (
+        'type'      => 'int-11',
+        'name'      => '发货日期',
+        'default'   => '',
+        'match'     => 'is_numeric',
+        'desc'      => '',
+        'search'    => 'date',
+        'list'      => '"{fadate}" > 0 ? date("Y-m-d H:i:s", {fadate}) : "-"',
+        'list_order' => 9,
+    ),
+
     'shop-buy_order_ps-cdate'=> array
     (
         'name'      => '发货日期',
@@ -458,7 +470,7 @@ $struct = array
         'match'     => 'option',
         # 读取另外表的关联方式
         'sync'      => array('id', 'order_id'),
-        'list_order' => 9,
+        // 'list_order' => 9,
     ),
 
     'shop-buy_order_ps-ydate'=> array

app/shop/database/sell_order.php

@@ -667,6 +667,17 @@ return array
             //'list_order' => 8,
         ),
 
+        'fadate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '发货时间',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'desc'      => '',
+            'list'      => '"{fadate}" > 0 ? date("Y-m-d H:i:s", {fadate}) : "-"',
+            'list_order' => 8,
+        ),
+
         'shop-sell_order_ps-cdate'=> array
         (
             'name'      => '发货时间',
@@ -675,8 +686,8 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('id', 'order_id'),
-            'list'      => '"{shop-sell_order_ps-cdate}" ? date("Y-m-d H:i", \'{shop-sell_order_ps-cdate}\') : "-"',
-            'list_order' => 8,
+            // 'list'      => '"{shop-sell_order_ps-cdate}" ? date("Y-m-d H:i", \'{shop-sell_order_ps-cdate}\') : "-"',
+            // 'list_order' => 8,
         ),
 
         'state'     => array

app/shop/lib/Cron.php

@@ -759,4 +759,36 @@ class Cron
 
         return 'ok';
     }
+    #新增
+    #平台商城订单表同步发货时间sell_order
+    public function tongSellOrder_api()
+    {
+        $data = Dever::db('shop/sell_order')->state();
+        foreach ($data as $k => $v) {
+            if (isset($v['id']) && $v['id'] ) {
+                 $ps = Dever::db('shop/sell_order_ps')->find(array('order_id'=>$v['id']));
+                 $where['where_id'] = $v['id'];
+                 if (isset($ps) && $ps && isset($ps['cdate']) && $ps['cdate']) {
+                    $where['fadate'] = $ps['cdate'];
+                    Dever::db('shop/sell_order')->update($where);
+                 }
+            }
+
+        }
+    }
+    #门店采购发货时间
+    public function tongBuyOrder_api()
+    {
+        $data = Dever::db('shop/buy_order')->state();
+        foreach ($data as $k => $v) {
+            if (isset($v['id']) && $v['id']) {
+                $ps = Dever::db('shop/buy_order_ps')->find(array('order_id'=>$v['id']));
+                $where['where_id'] = $v['id'];
+                if (isset($ps) && $ps && isset($ps['cdate']) && $ps['cdate']) {
+                    $where['fadate'] = $ps['cdate'];
+                    Dever::db('shop/buy_order')->update($where);
+                }
+            }
+        }
+    }
 }

app/shop/lib/Sell.php

@@ -2109,7 +2109,7 @@ class Sell
     public function notice($info)
     {
         $config = Dever::db('shop/sell_order')->config;
-        $state = Dever::db('shop/sell_order')->update(array('where_id' => $info['id'], 'status' => 3, 'operdate' => time()));
+        $state = Dever::db('shop/sell_order')->update(array('where_id' => $info['id'], 'status' => 3, 'operdate' => time(),'fadate'=>time()));
 
         # 给用户发消息
         if ($info['uid'] && $info['uid'] > 0) {

app/store/admin/Order.php

@@ -330,7 +330,7 @@ class Order extends Core
     	} else {
     		Dever::db('shop/buy_order_ps')->insert($update);
     	}
-    	Dever::db('shop/buy_order')->update(array('status' => 4, 'where_id' => $update['order_id']));
+    	Dever::db('shop/buy_order')->update(array('status' => 4, 'where_id' => $update['order_id'],'fadate'=>time()));
 
         # 检测是否是关联订单
         $order = Dever::db('shop/buy_order')->find($update['order_id']);