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

application/models/Business/Order/OrderService.php

@@ -736,7 +736,7 @@ 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'],
+                    $pushData=array('storeId'=>$order['storeId'],
                         'type'=>ApiConst::messageWaitReceive,
                         'waitReceiveCount'=>ApiConst::reduceOne,
                         'waitDeliveryCount'=>0,
@@ -748,7 +748,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         'alertCount'=>ApiConst::zero,
                         'params'=>array('c'=>'shopkeeper',
                             'm'=>'orderDetail',
-                            'orderId'=>$order['order_id']));
+                            'orderId'=>$order['orderId']));
                     $push->addOneToClient($pushData);
 
                 }

application/models/Business/Order/RefundService.php

@@ -223,6 +223,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $refund_array['seller_state'] = $seller_state;//卖家处理状态:1为待审核,2为同意,3为不同意
         $refund_array['seller_message'] = $text;
         $refund_array['refund_amount'] = $refundAmount;
+        $refundReturnDao->db->setDb($refundReturnDao->dbName);
         $refundReturnDao->db->doTransaction();
         if($seller_state!=2){   //拒绝退款
             $result= $orderGoodsDao->update(array('rec_id'=>$refund['order_goods_id']), array('is_refund'=>0, 'refund_state_name'=>'卖家拒绝退货', 'gmt_update'=>TIMESTAMP));
@@ -313,10 +314,27 @@ class RefundServiceModel extends \Business\AbstractModel
                     return false;
                 }
             }
+
+            $refundReturnDao->db->doCommit();
             $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
             $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
             \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
-            $refundReturnDao->db->doCommit();
+            $push=\Our\Push::getInstance();
+            $pushData=array('storeId'=>$storeId,
+                'type'=>ApiConst::messageRefund,
+                'waitReceiveCount'=>ApiConst::zero,
+                'waitDeliveryCount'=>0,
+                'waitGetCount'=>0,
+                'orderCount'=>ApiConst::zero,
+                'waitRefundProccessCount'=>ApiConst::reduceOne,
+                'waitRefundReceiveCount'=>ApiConst::zero,
+                'refundCount'=>ApiConst::reduceOne,
+                'alertCount'=>ApiConst::zero,
+                'params'=>array('c'=>'shopkeeper',
+                    'm'=>'orderDetail',
+                    'refundId'=>$order_id));
+            $push->addOneToClient($pushData);
+            $push->sendTcpMessage();
             return true;
         }
         $refundReturnDao->db->doRollback();

application/models/Business/Store/StoreService.php

@@ -168,17 +168,17 @@ class StoreServiceModel extends \Business\AbstractModel{
 
         list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId);
         //展示图片
-        $detailImg = [];
-        if($storeInfo['store_detail_image']){
-            $storeDetailImg = unserialize($storeInfo['store_detail_image']);
-            if($storeDetailImg && is_array($storeDetailImg)){
-                foreach ($storeDetailImg as $v){
-                    if($v) {
-                        $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v, \Our\ImageConst::storeQualificationImg);
-                    }
-                }
-            }
-        }
+//        $detailImg = [];
+//        if($storeInfo['store_detail_image']){
+//            $storeDetailImg = unserialize($storeInfo['store_detail_image']);
+//            if($storeDetailImg && is_array($storeDetailImg)){
+//                foreach ($storeDetailImg as $v){
+//                    if($v) {
+//                        $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v, \Our\ImageConst::storeQualificationImg);
+//                    }
+//                }
+//            }
+//        }
         //地址
         $address = '';
         if($storeInfo['area_info']){
@@ -187,6 +187,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         if($storeInfo['store_address']){
             $address .= $storeInfo['store_address'];
         }
+        $address = preg_replace("/\s/",'',$address);
         //营业时间
         $openingHours = '';
         if($storeInfo['store_start_time'] && $storeInfo['store_close_time']){
@@ -203,7 +204,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $returnClass[] = $v['gc_name'];
             }
         }
-        $qualificationPics = $this->getStoreQualification($storeId,$storeInfo['member_id']);
+        list($qualificationPics,$detailImg) = $this->getStoreQualification($storeId,$storeInfo['member_id']);
         return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$openingHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
     }
     public function getRecommendGoodsCache($param,$memberId){
@@ -433,9 +434,17 @@ class StoreServiceModel extends \Business\AbstractModel{
     }
     public function getStoreQualification($storeId,$memberId) {
         $pics = \DAO\Store\QmStoreApplyClassModel::getInstance()->getApplyPicCache($storeId,'file_name');
-        $join = \DAO\Store\StoreJoininModel::getInstance()->getOneByMemberIdCache($memberId,'business_licence_photo');
+        $join = \DAO\Store\StoreJoininModel::getInstance()->getOneByMemberIdCache($memberId,'business_licence_photo,shop_front_photo,shop_photo');
         $join['business_licence_photo'] && $pics[] =\Our\Common::getStaticFile($join['business_licence_photo'], \Our\ImageConst::Register, 'ossHost');
-        return \DAO\Store\QmStoreApplyClassModel::getInstance()->addWaterMark($pics);
+        $qualificationPics = \DAO\Store\QmStoreApplyClassModel::getInstance()->addWaterMark($pics);
+        $showImg = [];
+        $join['shop_front_photo'] && $showImg[] = \Our\Common::getStaticFile($join['shop_front_photo'], \Our\ImageConst::Register, 'ossHost');
+        if($shop_photo = unserialize($join['shop_photo'])) {
+            foreach ($shop_photo as $v) {
+                $v && $showImg[] = \Our\Common::getStaticFile($v, \Our\ImageConst::Register, 'ossHost');
+            }
+        }
+        return array($qualificationPics,$showImg);
     }
     /**
      * 获取搜索页推荐关键字