pc

application/models/Business/Order/OrderService.php

@@ -769,7 +769,7 @@ class OrderServiceModel extends \Business\AbstractModel
 
             //获得订单列表
             //  $orders=$orderDao->getList($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc'));
-            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($diliverymanId));
+            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, ApiConst::zero, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($diliverymanId));
             $goodsDao = \DAO\GoodsModel::getInstance();
             $orderIds = array_column($orders['list'], 'orderId');
             $orderCommons = $orderCommonDao->getAllByOrderIdsCache($orderIds, $diliverymanId, $orderCommonDao->orderCommonField);
@@ -793,6 +793,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['lng'] = $delivery['reciverInfo']['lng'] ? $delivery['reciverInfo']['lng'] : 0.0;
                 $delivery['lat'] = $delivery['reciverInfo']['lat'] ? $delivery['reciverInfo']['lat'] : 0.0;
                 $delivery['subAddress'] = isset($delivery['reciverInfo']['sub_address']) ? $delivery['reciverInfo']['sub_address'] : '';
+                $delivery['distributionFee']=$value['distributionFee'];
                 unset($delivery['goodsAmount']);
                // unset($delivery['orderState']);
                 unset($delivery['refundState']);
@@ -877,6 +878,8 @@ class OrderServiceModel extends \Business\AbstractModel
             'subAddress' => isset($reciverInfo['sub_address'])?$reciverInfo['sub_address']:'',
             'orderGoods' => $orderGoods,
             'shippingFee' => $this->order['shippingFee'],
+            'distributionFee'=>$delivery['distributionFee'],
+            'isReceivePayment'=>$this->order['isReceivePayment']
 
         );
         return $returnData;

application/models/DAO/Order/QmDeliverymanLog.php

@@ -17,7 +17,7 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
 {
 
     public $fieldList = 'id,finish_time finishTime,get_time as getTime,order_id as orderId';
-    public $fieldDetail = 'id,finish_time finishTime,get_time as getTime,order_id as orderId,delivery_state as deliveryState,order_type as orderType';
+    public $fieldDetail = 'id,finish_time finishTime,get_time as getTime,order_id as orderId,delivery_state as deliveryState,order_type as orderType,distribution_fee as distributionFee';
 
     /**
      * 表名