ordersort

application/library/Our/ApiConst.php

@@ -240,8 +240,11 @@ class ApiConst
     const bySelf = 0;
     const bySeller = 1;
     const express = 2;
+
+
 //待自提
     const oneHandred=100;
+    const cancelOrderBySelf=4;
     //待配送
     const oneHandredOne=101;
 

application/models/Business/Order/OrderService.php

@@ -332,7 +332,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $isAllowCancel = $orderDao->isAllowCancel($order);
         $isAllowCance = true;
         if ($isAllowCancel) {
-            $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel);
+            $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
             if ($res) {
                 $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);

application/models/Business/Store/ShopkeeperService.php

@@ -445,6 +445,9 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 }
 
             } else {
+                $order=array(
+                    'gmt_update'=>'desc'
+                );
                 if (!empty($orderState)) {
                     $where .= ' and han_order.order_state=' . $orderState;
                 }

application/models/DAO/Order/Order.php

@@ -263,7 +263,7 @@ class OrderModel extends \DAO\AbstractModel
         return $this->update($where, $data);
     }
 
-    public function updateStatusByOrderId($orderIds, $status, $isConfirm = false)
+    public function updateStatusByOrderId($orderIds, $status, $isConfirm = false,$is_effective=ApiConst::zero)
     {
         $this->setDb($this->dbName);
         if (is_array($orderIds)) {
@@ -276,6 +276,9 @@ class OrderModel extends \DAO\AbstractModel
             $data['is_receive_payment']=ApiConst::receivePayment;
             $data['payment_time']=TIMESTAMP;
         }
+
+            $data['is_effective']=$is_effective;
+
         $data['order_state'] = $status;
         $data['finnshed_time']=TIMESTAMP;
         if ($isConfirm) {