pc

application/models/Business/Order/OrderService.php

@@ -104,7 +104,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
-        $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
+        //$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         if ($keyWord !== false) {
             $where = $this->getOrderIndexWhere($memberId, $keyWord, $pageIndex, $pageSize);
             if($where===false){
@@ -128,7 +128,7 @@ class OrderServiceModel extends \Business\AbstractModel
         }
 
         //获得订单列表
-        $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($memberId));
+        $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('gmt_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($memberId));
         if (!empty($orders['list'])) {
             $orderIds = array_column($orders['list'], 'orderId');
             //获得订单商品列表
@@ -765,7 +765,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['mobPhone'] = $delivery['mobPhone'] ? $delivery['mobPhone'] : '';
                 $delivery['finishTime'] = $delivery['finishTime'] ? $delivery['finishTime'] : ApiConst::zero;
                 $delivery['orderGoods'] = !empty($goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']))?$goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']):array();
-                $delivery['street'] = $delivery['reciverInfo']['address'] . $delivery['reciverInfo']['street'];
+                $delivery['street'] = $delivery['reciverInfo']['address'];
                 $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'] : '';
@@ -833,6 +833,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if($delivery['deliveryState']==ApiConst::deliveryStateWait||$delivery['deliveryState']==ApiConst::deliveryStateWaitTen){
             $delivery['deliveryState']=ApiConst::deliveryStateWait;
         }
+        // $reciverInfo['sub_address']
         $returnData = array(
             'orderId' => $this->order['orderId'],
             'storeName' => $this->order['storeName'],
@@ -848,7 +849,7 @@ class OrderServiceModel extends \Business\AbstractModel
             'street' => $reciverInfo['street'],
             'lng' => isset($reciverInfo['lng']) ? $reciverInfo['lng'] : ApiConst::zero,
             'lat' => isset($reciverInfo['lat']) ? $reciverInfo['lat'] : ApiConst::zero,
-            'subAddress' => isset($reciverInfo['sub_address']) ? $reciverInfo['sub_address'] : '',
+            'subAddress' => isset($reciverInfo['address']),
             'orderGoods' => $orderGoods,
             'shippingFee' => $this->order['shippingFee'],
 

application/models/Business/Store/ShopkeeperService.php

@@ -491,7 +491,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $this->taskIndex = PageConst::taskPageBegin;
         $this->taskSize = PageConst::taskPageSize;
         do {
-            $addDatas = array();
             $storeMemberStatisticData = $orderGoodDao->getMemberStoreStaticsByCreateTime($beginTime, $this->taskIndex, $this->taskSize);
             $storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false;
             if($storeMemberStatisticData){