ccw:master_dev

application/library/Our/ApiConst.php

@@ -244,6 +244,7 @@ class ApiConst
 
 //待自提
     const oneHandred=100;
+    const cancelOrderAuto=1;
     const closeOrder=2;
     const cancelOrderBySelf=4;
     //待配送

application/models/Business/Order/OrderService.php

@@ -665,7 +665,7 @@ class OrderServiceModel extends \Business\AbstractModel
 
             foreach ($orders as $order) {
                 //更新订单信息
-                $updateData = array('order_state' => ApiConst::orderStateCancel);
+                $updateData = array('order_state' => ApiConst::orderStateCancel,'is_effective'=>ApiConst::cancelOrderAuto);
                 $update = $orderDao->update(array('order_id' => $order['orderId']),$updateData);
                 $updateCommonData['order_message']=DescribeConst::cancelOrderMessage;
                 $res=$orderCommonDao->update(array('order_id'=>$order['orderId']),$updateCommonData);