oss

application/models/Business/Store/ShopkeeperService.php

@@ -293,6 +293,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     public function getRetrunDatas($storeId, $where, $pageIndex, $pageSize,$order = array('gmt_update' => 'desc'))
     {
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
+        $qmDeliveryManLogDao =\DAO\Order\QmDeliverymanLogModel::getInstance();
         $orderDao = \DAO\Order\OrderModel::getInstance();
         $goodsDao = \DAO\GoodsModel::getInstance();
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance();
@@ -304,8 +305,12 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $orderGoodsDao->orderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $orderGoodsDao->orderGoodsField);
                 $orderCommons=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderCommonDao, 'getAllByOrderIds'), array($orderIds, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($storeId));
+                $qmDeliveryManLogWhere['order_id']=array('in',$orderIds);
+                $qmDeliveryManLogWhere['type']= ApiConst::orderTypeBuy;
+                $qmDeliveryManLogs=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array($where, $qmDeliveryManLogDao->fieldDetail,ApiConst::zero,$pageSize), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
-                $ordersOrderCommons = Common::intergrateOneToOne($orders, $orderCommons, 'orderId', 'orderId');
+                $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs, 'orderId', 'orderId');
+                $ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId');
                 $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');
                 foreach ($orderMerge as &$value) {
                     $value['orderStateName'] = $orderDao->getStatusText($value);
@@ -334,12 +339,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                             $diliverymanDao = DiliverymanModel::getInstance();
                             $res = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$diliverymanDao, 'findById'), array($value['diliverymanId']), \Our\ApiConst::oneDaySecond, array($value['diliverymanId']));
                             $value['deliveryman'] = $diliverymanDao->convert($res);
+                            $value['deliveryman']['distributionFee']=$value['distributionFee'];
                         }
                     } else {
                         unset($value['reciverInfo']);
                     }
                     unset($value['couponId']);
                     unset($value['refundAmount']);
+                    unset($value['distributionFee']);
                     unset($value['paymentTime']);
                     unset($value['finnshedTime']);
                     unset($value['paymentCode']);

application/models/DAO/Order/QmDeliverymanLog.php

@@ -19,6 +19,7 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
     public $fieldList = 'id,finish_time finishTime,get_time as getTime,order_id as orderId,distribution_fee as distributionFee';
     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';
 
+
     /**
      * 表名
      *
@@ -88,6 +89,8 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
         return $list ? $list : array();
     }
 
+
+
     /**
      * 更具状态获得配送订单列表
      * @param $where

conf/url.ini

@@ -12,7 +12,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
 config.url.userHost = ""
 ;
 ; ; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
+;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 ;
 ; ;推送域名
 config.url.pushHost="172.16.142.15:9503";
@@ -36,8 +37,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
 ; 用户中心host
 config.url.userHost = ""
 
-; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
+//config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
@@ -54,9 +55,9 @@ config.url.convert=/usr/local/bin/wkhtmltoimage
 config.url.resourcesHost = "http://apitest.shenbd.com"
 ; 用户中心host
 config.url.userHost = ""
-
+config.url.ossHost = "https://img.shenbd.com"
 ; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
@@ -74,9 +75,9 @@ config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
 config.url.resourcesHost = "http://apitest.qm.com"
 ; 用户中心host
 config.url.userHost = ""
-
+config.url.ossHost = "https://img.shenbd.com"
 ; oss 域名
-config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+;config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";