Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/controllers/Index.php

@@ -48,6 +48,9 @@ class IndexController extends \Our\Controller_Abstract  {
         if($paramsStr['type']==\Our\ApiConst::shareGoods){
             $this->_view->display('index/goods.phtml');
         }
+        if($paramsStr['type']==\Our\ApiConst::shareSaler){
+            $this->_view->display('index/saleShare.phtml');
+        }
         exit;
     }
 

application/library/Our/Common.php

@@ -273,7 +273,11 @@ class Common
 
         return true;
     }
-
+    public static function getRealStr($originStr){
+        $result=str_replace(array("\r\n", "\r", "\n"), "", $originStr);
+        $result=trim($result);
+        return $result;
+    }
     /**
      * sql字符串格式化
      * @param unknown $phone

application/library/Our/SmsTemplateConst.php

@@ -44,5 +44,44 @@ class SmsTemplateConst{
                 'storename',
             )
         ),
+        //商户微信支付关闭通知 尊敬的${storename}，由于您在微信支付商户平台取消对我的身边店的授权，所以平台关闭了您的线上支付功能。
+        'mchWxPayClose' => array(
+            'templateId'=>'SMS_151577277',
+            'parameters'=>array(
+                'storename',
+            )
+        ),
+        //尊敬的${storename}，我的身边店已收到您缴纳的保证金${money}。
+        'depositIncome' => array(
+            'templateId'=>'SMS_151547289',
+            'parameters'=>array(
+                'storename',
+                'money'
+            )
+        ),
+        //尊敬的${storename}，我的身边店已原路退回保证金${money}。
+        'depositOutcome' => array(
+            'templateId'=>'SMS_151547293',
+            'parameters'=>array(
+                'storename',
+                'money'
+            )
+        ),
+        //尊敬的${storename}，您的店铺已经审核通过，请登录商户后台查看。
+        'storeCheckPass'=>  array(
+            'templateId'=>'SMS_151577269',
+            'parameters'=>array(
+                'storename'
+            )
+        ),
+        //尊敬的${storename}，您的店铺由于${reason}无法通过审核，请登录商户后台查看。
+        'storeCheckUnpass'=>  array(
+            'templateId'=>'SMS_151547302',
+            'parameters'=>array(
+                'storename',
+                'reason'
+            )
+        )
+
     );
 }

application/models/Business/Cart/CartService.php

@@ -1255,11 +1255,12 @@ class CartServiceModel extends \Business\AbstractModel{
 
 
     function addOrder($data,$memberId,$currentAddress){
+        $postData = json_decode($data['param'],true);
         $orderUtil =\Order\OrderConfirmUtil::getInstance();
         $return = $orderUtil->addOrder($data,$memberId,$currentAddress);
         //删除订单列表缓存
         $orderDao=\DAO\Order\OrderModel::getInstance();
-        $orderDao->deleteOrderCache($memberId);
+        $orderDao->deleteOrderCache($memberId,false,($postData['storeId'])?$postData['storeId']:$postData[0]['storeId']);
 
         return $return;
     }

application/models/Business/Goods/GoodsClassService.php

@@ -71,7 +71,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         }
         //获取当前城市可用签约分类
         $signStoreInfo = $this->getSignStoreInfo($where);
-
         $signStoreIds = $signStoreInfo['signStoreIds'];//当前位置签约店铺ID
         $signParentClassIds = $signStoreInfo['signParentClassIds'];//当前位置签约分类对应一级分类
         $classIds = array();
@@ -164,7 +163,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         $serviceStoreIds = array();
         if($storeList){
             foreach ($storeList as $key=>$store){
-                $result =\Store\StoreUtil::getInstance()->checkAddressInServiceAreaByStore(array('lng'=>$where['lng'],'lat'=>$where['lat']),$storeIndexList[$tempStore['store_id']]);
+                $result =\Store\StoreUtil::getInstance()->checkAddressInServiceAreaByStore(array('lng'=>$where['lng'],'lat'=>$where['lat']),$storeIndexList[$store['store_id']]);
                 if($result){
                     $serviceStoreIds[] = $store['store_id'];
                 }

application/models/Business/Order/OrderService.php

@@ -124,7 +124,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 if($orderState==ApiConst::orderStateComplete){
                     $where['evaluation_state']=ApiConst::waitEvaluation;
                     $where['order_state']=array('eq',ApiConst::orderStateComplete);
-                }elseif($orderState==ApiConst::orderStateWaitRecieveOne){
+                }elseif($orderState==ApiConst::orderStateWaitRecieveOne || $orderState==ApiConst::orderStateWaitRecieve){
                     $where['shipping_type']=array('eq',ApiConst::bySeller);
                     $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve));
                 }elseif($orderState==ApiConst::orderStateWaitSendOne){
@@ -231,7 +231,6 @@ class OrderServiceModel extends \Business\AbstractModel
      */
     public function getOrderDetail($orderId)
     {
-       error_reporting(E_ALL);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
@@ -646,6 +645,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCancelTime, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderCancelBeyondTime;
+        $storeDao=\DAO\StoreModel::getInstance();
         $orders = $orderDao->getMustCecelOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
         if (!empty($orders)) {
 
@@ -666,6 +666,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     echo '订单:'.$order['order_id'].'is_refund'.'没更新成功';
                 }
                 $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+                $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
             }
             $orderIds = array_column($orders, 'orderId');
             //更新商品库存
@@ -704,6 +705,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
+        $storeDao=\DAO\StoreModel::getInstance();
        // $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
         if (!empty($orders)) {
@@ -717,6 +719,23 @@ class OrderServiceModel extends \Business\AbstractModel
                         }
                     }
                     $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+                    $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
+                    $push=\Our\Push::getInstance();
+                    $pushData=array('storeId'=>$order['store_id'],
+                        'type'=>ApiConst::messageWaitReceive,
+                        'waitReceiveCount'=>ApiConst::reduceOne,
+                        'waitDeliveryCount'=>0,
+                        'waitGetCount'=>0,
+                        'orderCount'=>ApiConst::reduceOne,
+                        'waitRefundProccessCount'=>ApiConst::zero,
+                        'waitRefundReceiveCount'=>ApiConst::zero,
+                        'refundCount'=>ApiConst::zero,
+                        'alertCount'=>ApiConst::zero,
+                        'params'=>array('c'=>'shopkeeper',
+                            'm'=>'orderDetail',
+                            'orderId'=>$order['order_id']));
+                    $push->addOneToClient($pushData);
+
                 }
 
             $orderIds = array_column($orders, 'orderId');
@@ -893,6 +912,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderLogDao=\DAO\Order\OrderLogModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDetail=$orderDao->getByOrderId($orderId,$orderDao->getOrderDetailField());
         $orderDetail=$orderDetail[ApiConst::arrBegin];
+        $storeDao=\DAO\StoreModel::getInstance();
         if($orderDetail['storeId']!=$storeId){
             ErrorModel::throwException(CodeConfigModel::orderNotExist);
         }
@@ -901,6 +921,8 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
+        $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);
+        $storeDao->deleteStoreCache($storeId,$orderId);
         $orderLogDao->add($orderDetail['orderId'],ArrayConst::logMsgType[ApiConst::sellerUpdateOrderAmount],DescribeConst::sellerLog,$memberName,$orderDetail['orderState']);
         return $res;
     }

application/models/Business/Store/DeliveryService.php

@@ -60,6 +60,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
             $orderDao->db->doRollback();
             ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);
         }
+        $orderDao->deleteOrderCache(null, $data['orderId'], $data['storeId'], true);
         $orderDao->db->doCommit();
         return $res;
     }

application/models/Business/Store/ShopkeeperService.php

@@ -239,6 +239,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $where['store_id'] = $storeId;
         $where['order_state'] = ApiConst::orderStateWaitConfirm;
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $storeDao=\DAO\StoreModel::getInstance();
         $order = $orderDao->find($where);
         if (empty($order)) {
             if (empty($storeId)) {
@@ -272,6 +273,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
            // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
             //\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
             $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);
+            $storeDao->deleteStoreCache($order['store_id'],$orderId);
             //   \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
             return $result;
         }
@@ -293,19 +295,24 @@ 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();
-        $returnData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $orderDao->getOrderDetailField(), $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
+        $returnData = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $orderDao->getOrderDetailField(), $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId));
         $orders = $returnData['list'];
         if (!empty($orders)) {
             $orderIds = array_column($orders, 'orderId');
             if (!empty($orderIds)) {
-                $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $orderGoodsDao->orderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
+                $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\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'getAllByOrderIds'), array($orderIds, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($storeId));
+                $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['order_type']= ApiConst::orderTypeBuy;
+                $qmDeliveryManLogs=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array($qmDeliveryManLogWhere, $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['list'], '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 +341,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']);
@@ -462,6 +471,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $where['order_id']=$orderId;
         $where['store_id']=$storeId;
         $count=$orderDao->getCountByWhere($where);
+        $orderDao->deleteOrderCache($memberId,$orderId,$storeId);
         if($count){
             $data['is_receive_payment']=TIMESTAMP;
             $updateId=$orderDao->updateByOrderId($data,$orderId);
@@ -472,11 +482,21 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
     }
 
+    public function getOrderDetail($storeId, $orderId){
+        $where['order_id']=$orderId;
+        $returnData = $this->getRetrunDatas($storeId, $where, ApiConst::pageIndex, ApiConst::pageSize);
+        if(!empty($returnData['orders'])){
+            return $returnData['orders'][ApiConst::zero];
+        }else{
+            return new \stdClass();
+        }
+    }
     /**
      * 订单详情
      */
-    public function getOrderDetail($memberId, $orderId)
+    public function getOrderDetail_bak($memberId, $orderId)
     {
+
         $storeId = $this->_getStoreByMemberId($memberId);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
@@ -484,6 +504,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $diliverymanDao = \DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
         $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
+        $qmDeliveryManLogDao=\DAO\Order\QmDeliverymanLogModel::getInstance();
+
         //订单
         $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond, array($orderId));
         if ($order['store_id'] != $storeId) {
@@ -494,7 +516,11 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
         //收货人地址
         //收货人信息
-        $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
+        $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($orderId));
+
+        $qmDeliveryManLogWhere['order_id']=$orderId;
+        $qmDeliveryManLogWhere['order_type']=ApiConst::orderTypeBuy;
+        $qmDeliveryManLog=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'find'), array($qmDeliveryManLogWhere,$qmDeliveryManLogDao->fieldDetail), \Our\ApiConst::oneDaySecond, array($orderId));
         //$this->orderCommon = $orderCommonDao->findByOrderId($orderId, $this->orderCommonField);
         $reciverInfo = $this->orderCommon['reciverInfo'];
         $reciverInfo = unserialize($reciverInfo);
@@ -530,6 +556,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
         if ($returnData['diliverymanId']) {
             $returnData['deliveryman'] = $diliverymanDao->convert($this->diliveryman, $diliverymanDao->getDeliveryManFields());
+            $returnData['deliveryman']['distributionFee']=$qmDeliveryManLog['distributionFee'];
         } else {
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();

application/models/Business/User/ShareService.php

@@ -36,9 +36,17 @@ class ShareServiceModel extends \Business\AbstractModel
         $data['driverType'] = $driverType;
         $data['qrCode']=$this->growQrcode($data);
         if($data['type']==ApiConst::shareStore || $data['type']== ApiConst::shareSaler){
-            $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
-            $data['address']=$storeDao->getAddress($data['id']);
+            if(!empty($data['id'])){
+                $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
+                $store=$storeDao->getStoreInfoCache($data['id']);
+                $data['address']=$store['store_address'];
+                $data['imgUrl']=$storeDao->getStoreLabelSrc($store['store_label']);
+                $data['storeName']=$store['store_name'];
+                $data['desc']=$store['store_notice'];
+            }
+
         }
+
        // $data['qrCode']=\Our\RedisHelper::cachedFunction(\Redis\Db0\MemberRedisModel::getInstance(), array(&$this, 'growQrcode'), array($data));
         return $data;
 

application/models/DAO/Order/ApiReciverInfo.php

@@ -68,6 +68,7 @@ class ApiReciverInfoModel extends \DAO\AbstractModel
     public function getReceiverInfo(){
         $reciverInfo['mobPhone']=$this->mobPhone;
         $reciverInfo['telPhone']=$this->telPhone;
+        $this->address=Common::getRealStr($this->address);
         $reciverInfo['address']=$this->address;
         $reciverInfo['areaInfo']=$this->areaInfo;
         $reciverInfo['lng']=$this->lng;

application/models/DAO/Order/Order.php

@@ -849,11 +849,16 @@ class OrderModel extends \DAO\AbstractModel
     }
 
     //删除订单列表缓存
-    public function deleteGetListByMemberId($memberId)
+    public function deleteGetListByMemberId($storeId)
     {
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getList'), array(), array($memberId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
     }
 
+    public function deleteStoreOrderListCacheByStoreId($storeId){
+        if(!empty($storeId)){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
+        }
+    }
     //删除订单缓存
     public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=ApiConst::zero)
     {
@@ -863,17 +868,16 @@ class OrderModel extends \DAO\AbstractModel
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
         }
         if (!empty($stroeId)) {
+
             if ($deleteGetShopKeeperCountByStoreId) {
                 $this->deleteGetShopKeeperCountByStoreId($stroeId);
             }
             if ($deleteGetFavoritesCountByStoreId) {
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
-
             }
-            $this->deleteGetListByMemberId($stroeId);
+            $this->deleteStoreOrderListCacheByStoreId($stroeId);
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-
             \DAO\Store\MemberFavoritesStoreStoreMemberStatisticsModel::getInstance()->deleteCacheGetGoodsCountOrderTotalByStoreId($stroeId);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId,$stroeId);
         }

application/models/DAO/Order/OrderLog.php

@@ -52,7 +52,7 @@ class OrderLogModel extends \DAO\AbstractModel
         $data['log_user']=$logUser;
         $data['log_orderstate']=$logOrderState;
         $data['log_time']=TIMESTAMP;
-        return $this->addLogToMongo($data);
+        return $this->addLog($data);
     }
     public function addLog($log){
         $this->setDb($this->dbName);

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

application/models/DAO/Order/RefundReturn.php

@@ -553,6 +553,8 @@ class RefundReturnModel extends \DAO\AbstractModel {
         return self::$_instance;
     }
 
+
+
     /**
      * @param $storeId
      * @param $orderState

application/models/DAO/Store.php

@@ -41,10 +41,10 @@ class StoreModel extends \DAO\AbstractModel
 
         if (!empty($offlinPayway)) {
             $offlinPayway=unserialize($offlinPayway);
-            $res['images']=[];
+            $res['imageUrls']=[];
             foreach($offlinPayway['images'] as $image){
                 $image= \Our\Common::getStaticFile($image, \Our\ImageConst::storeLabel);
-                array_push($res['images'],$image);
+                array_push($res['imageUrls'],$image);
             }
 
             $res['payway']=$offlinPayway['payway']?$offlinPayway['payway']:'';
@@ -231,6 +231,34 @@ class StoreModel extends \DAO\AbstractModel
         return $result;
     }
 
+    public function deleteStoreRefundCache($storeId,$orderId=ApiConst::zero){
+
+        if(!empty($storeId)){
+            $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
+            $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
+            $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array(), array($storeId));
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array(), array($storeId));
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'getList'), array(), array($storeId));
+        }
+        if(!empty($orderId)){
+
+            $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
+             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'findByRecId'), array(), array($orderId));
+             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array(), array($orderId));
+             \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array(), array($orderId));
+        }
+    }
+    public function deleteStoreCache($storeId,$orderId){
+        if(!empty($storeId)){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
+        }
+        if(!empty($orderId)){
+            $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array(), array($orderId));
+        }
+    }
+
     public function getStoresByCityCode($cityCode, $field = 'store_id,store_longitude,store_latitude,max_sign_rang,max_sales_rang,store_sales_scope')
     {
         $storeClassCondition = " store_citycode = '" . $cityCode . "' ";

application/modules/Client/controllers/Delivery.php

@@ -29,11 +29,13 @@ class DeliveryController extends \Our\Controller_AbstractClient {
      */
     public function selectDeliveryAction(){
         $deliveryService=\Business\Store\DeliveryServiceModel::getInstance();
+        $orderDao=\DAO\Order\OrderModel::getInstance();
         $data=$this->req['data'];
         $data['storeId']=$this->storeId;
         unset($data['key']);
         $result =$deliveryService->selectDeliveryMan($data);
         if($result!==false){
+
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }
         ErrorModel::throwException(CodeConfigModel::commonError);

application/modules/Client/controllers/Shopkeeper.php

@@ -169,7 +169,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         if(empty($orderId)){
             ErrorModel::throwException(CodeConfigModel::emptyOrderIdForPay);
         }
-        $result = $this->shopkeeperService->getOrderDetail($this->memberId,$orderId);
+        $result = $this->shopkeeperService->getOrderDetail($this->storeId,$orderId);
         $this->success($result);
         if($result){
             $this->success(array(),\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
@@ -325,8 +325,8 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
      * @ccw
      */
     public function getRefundDetailAction(){
-        $refundService =\Business\Order\RefundServiceModel::getInstance();
-        $res=$refundService->getInfo($this->req[\Our\NameConst::data]['refundId']);
+        $refundService=\Business\Order\RefundServiceModel::getInstance();
+        $res=$refundService->getStoreRefundDetail($this->storeId,$this->req[\Our\NameConst::data]['refundId']);
         $this->success($res);
     }
 

application/views/index/saleShare.phtml

+<!DOCTYPE html>
+
+<html lang="en">
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
+    <title></title>
+    <style type="text/css">
+        html,body,p,span,div,img{margin:0;padding:0;}body{width:750px;}
+        .shareC { width:750px;  padding:0; text-align:center;font-family:"黑体";color:#212121;}
+        .header{background:url(/data/img/headerBg.png);padding-top:100px; height:415px;  }
+        .bgBD{width:162px; height:162px;background-color:white;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:0 auto;}
+        #headerBg{width:160px; height:160px;border-radius:50%;-moz-border-radius:50%;-webkit-border-radius:50%;margin:1px;}
+        #title{font-size:34px; margin-top:24px;}
+        .address{ font-size:28px; line-height:36px; padding:50px 110px 0 110px; height:108px;display:block; display:-webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
+        .noticePart{ width:560px;margin:16px auto 0 auto;  background:url(/data/img/noticeBg.png);}
+        .noticePart p{height:44px; font-size:20px; line-height:22px; padding:68px 28px 32px 28px; }
+        #notice{ max-width:504px;display:block; display:-webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
+        .qrcode{background:url(/data/img/flower.png);  margin:6px auto 0 auto;}
+        #qrImg {height:488px;}
+        #qrcodeImg img { margin: 0 auto;}
+        .footer{ font-size:30px; height:66px; line-height:66px; padding:0 0 55px 0;}
+        .footer img{vertical-align:bottom; display:inline-block;}
+    </style>
+</head>
+<body>
+<div class="shareC">
+    <div class="header">
+        <div class="bgBD">
+            <img src="" id="headerBg" />
+        </div>
+        <p id="title"></p>
+        <p class="address">地址：<span id="address"></span></p>
+    </div>
+    <div class="noticePart">
+        <p>
+            <span id="notice"></span>
+        </p>
+    </div>
+    <div class="qrcode" id="qrcode">
+        <img id="qrImg" src="" />
+        <div id="qrcodeImg"></div>
+        <p id="tip"></p>
+    </div>
+    <div class="footer">
+        <img src="/data/img/logo.png" /> 我的身边店
+    </div>
+</div>
+<script type="text/javascript" src="/data/js/qrcode.min.js"></script>
+<script type="text/javascript">
+    var pageObj = {
+        type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
+        id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
+        headerBg : "<?php echo $params['imgUrl'];?>",
+        url : "<?php echo $params['qrCode'];?>",
+        qrImg :  "<?php echo $params['qrCode'];?>",
+        title : "<?php echo $params['storeName'];?>",
+        address : "<?php echo $params['address'];?>",
+        notice : "<?php echo $params['desc'];?>"
+    };
+    if(pageObj.notice==null || pageObj.notice=="")
+        pageObj.notice="暂无公告";
+    var excute = ["title","address","notice"];
+    excute.forEach(function(v,i){
+        document.getElementById(v).innerHTML = pageObj[v];
+    });
+    document.getElementById("headerBg").src = pageObj.headerBg;
+    document.getElementById("qrImg").src = pageObj.qrImg+"?x-oss-process=image/resize,m_fill,h_186,w_186";
+   // new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+    //    if(pageObj.type<=2){
+    //        document.getElementById("qrImg").src = pageObj.qrImg;}
+    //    else{
+    //        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+    //    }
+
+
+
+</script>
+</body>
+</html>
\ No newline at end of file

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";
@@ -124,7 +125,7 @@ config.url.userHost = ""
 config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
-config.url.pushHost="127.0.0.1:9503";
+config.url.pushHost="192.168.1.201:9503";
 
 
 config.url.convert="/usr/local/bin/wkhtmltoimage";