Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into linqing

application/models/Business/Order/OrderService.php

@@ -672,7 +672,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         'data'=>array(
                             'keyword1'=>array('value'=>$order['order_sn']),
                             'keyword2'=>array('value'=>date('Y-m-d H:i', $order['send_time'])),
-                            'keyword3'=>array('value'=>date('Y-m-d H:i', $order['finnshed_time'])),
+                            'keyword3'=>array('value'=>date('Y-m-d H:i', TIMESTAMP)),
                             'keyword4'=>array('value'=>$order['store_name']),
                             'keyword5'=>array('value'=>$store_data['store_phone']),
                             'keyword6'=>array('value'=>$goods_str),