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

application/models/Business/Goods/GoodsCommonService.php

@@ -539,7 +539,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
 
         $commonInstance = \DAO\GoodsCommonModel::getInstance();
         $count = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonInstance, 'getCount'),array(array('store_id'=>$storeId)),\Our\ApiConst::oneDaySecond);
-        return array('storeId'=>$storeId,'storeName'=>$storeInfo['store_name'],'storeLabel'=>\DAO\StoreModel::getInstance()->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::goodsStoreImg),'goodsTotal'=>$count,'isQuality'=>$storeInfo['store_zhping'],'freeShippingPrice'=>$storeInfo['free_shipping_price'],'shareDesc'=>$storeInfo['store_share_desc'],'memberId'=>$storeInfo['member_id']);
+        return array('storeId'=>$storeId,'storeName'=>$storeInfo['store_name'],'storeLabel'=>\DAO\StoreModel::getInstance()->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::goodsStoreImg),'goodsTotal'=>$count,'isQuality'=>$storeInfo['store_zhping'],'freeShippingPrice'=>$storeInfo['free_shipping_price']*100,'shareDesc'=>$storeInfo['store_share_desc'],'memberId'=>$storeInfo['member_id']);
     }
 
     /**
@@ -900,7 +900,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                     \DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->insert($insert);
                 }
                 $saleOrderDAO = \DAO\SaleOrderModel::getInstance();
-                \Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($orderGoods['buyer_id']));
+                \Our\RedisHelper::delCachedFunction(\Redis\Db1\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($orderGoods['buyer_id']));
             }
             $pageBegin++;
         } while (!empty($orders['list']));

application/models/Business/Message/MessageService.php

@@ -141,6 +141,16 @@ class MessageServiceModel extends \Business\AbstractModel
         }
         return $avatar;
     }
+    public function unsetDb(){
+        $store = \DAO\StoreModel::getInstance();
+        $member = \DAO\MemberModel::getInstance();
+        $messageHistoryDao = \DAO\MessageHistoryModel::getInstance();
+        $mesageOneDao = \DAO\MessageOneModel::getInstance();
+        $store->unsetDb();
+        $member->unsetDb();
+        $messageHistoryDao->unsetDb();
+        $mesageOneDao->unsetDb();
+    }
 
     /**
      * 获得全部类型消息，每种消息一条数据，以及每种消息的未读条数

application/models/Business/Store/ShopkeeperService.php

@@ -499,19 +499,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 $memberIds=array_unique($memberId);
                 $goodsNumCount=$orderGoodDao->getMemberStoreOrderGoodsCount($storeIds,$memberIds);
                 $ordersCount=$orderDao->getSumAmountCountByMemberAndStoreId($storeIds,$memberIds);
-                $arr = array();
-                if(!empty($goodsNumCount)&&!empty($ordersCount)){
-                    foreach($goodsNumCount as $k=>$r){
-                        $arr[] = array_merge($r,$ordersCount[$k]);
-                    }
-                    $addDatas=$arr;
-                }else{
-                    if(!empty($goodsNumCount)){
-                        $addDatas=$goodsNumCount;
-                    }else{
-                        $addDatas=$goodsNumCount;
-                    }
-                }
+
                 if(!empty($goodsNumCount)){
                     $storeMemberStatisticDao->addAll($goodsNumCount,'orderGoodsCount');
                 }

application/models/Business/Store/StoreService.php

@@ -203,7 +203,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         if($stcGoods){
             $goodsIds = array_column($stcGoods,'goods_common_id');
             $goodsCommonDAO = \DAO\GoodsCommonModel::getInstance();
-            if($activities === false){
+            if(empty($activities)){
                 $tempGoods = $goodsCommonDAO->getGoodsList(array('goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price as goodsPrice,goods_marketprice,goods_commonid');
             }else{
                 $tempGoods = $goodsCommonDAO->getListWithSale(array('han_goods_common.goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,han_goods_common.goods_commonid,IFNULL(discount_price,han_goods_common.goods_price) AS goodsPrice',$activities);
@@ -743,7 +743,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         $commonDAO = \DAO\GoodsCommonModel::getInstance();
         //$activities = $this->isJoin($storeId,$memberId);
         $activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($storeId,$memberId);
-        if($activities === false){
+        if(empty($activities)){
             $field = 'goods_commonid AS goodsCommonId,goods_name AS goodsName,goods_price as goodsPrice,goods_marketprice AS goodsMarketPrice,goods_image AS goodsImage,goods_jingle AS goodsCopywriting';
             $list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getGoodsList'),array($where,$field,$limit,$order),\Our\ApiConst::oneDaySecond,array($storeId));
         }else{

application/models/DAO/Abstract.php

@@ -28,6 +28,10 @@ abstract class AbstractModel {
                 $this->db=LinkMySQLModel::get($dbLink);
             }
     }
+    public function unsetDb(){
+        unset($this->db);
+        LinkMySQLModel::unsetDbConecet();
+    }
     /**
      * 捕获dao中没有的方法，直接访问mysql中相应的类的方法
      * 

application/models/DAO/Order/OrderGoods.php

@@ -230,10 +230,17 @@ class OrderGoodsModel extends \DAO\AbstractModel {
     }
     public function getMemberStoreOrderGoodsCount($storeIds,$memberIds){
         $this->setDb($this->dbName);
+//        if(is_array($storeIds)){
+//            $storeIds=implode(',',$storeIds);
+//        }
+//        if(is_array($memberIds)){
+//            $memberIds=implode($memberIds);
+//        }
         $where['store_id']=array('in',$storeIds);
         $where['buyer_id']=array('in',$memberIds);
         $where['is_refund']=array('neq',ApiConst::one);
-        $res=$this->db->from($this->_tableName)->select($this->sumGoodsNum)->group("buyer_id")->group("store_id")->fetchAll();
+        $where=$this->db->getSqlWhereByArray($where);
+        $res=$this->db->from($this->_tableName)->select($this->sumGoodsNum)->where($where)->group("buyer_id")->group("store_id")->fetchAll();
         return $res;
 
     }

application/models/Mysql/LinkMySQL.php

@@ -63,6 +63,10 @@ class LinkMySQLModel{
 //        return self::$_instances[$database];
     }
 
+    public static function unsetDbConecet(){
+        unset(self::$_instances);
+    }
+
 
     /**
      * 构造函数 选择数据库

application/views/index/chatroom.phtml

@@ -15,7 +15,7 @@
 <!--    <script src="/data/js/vue.js"></script>-->
     <!--<script src="/config.js?timespan=12347" charset="utf-8"></script>-->
     <script src="/data/js/comet.js?timespan=123" charset="utf-8"></script>
-    <script src="/data/js/chat.js?timespan=12456791171072154133133" charset="utf-8"></script>
+    <script src="/data/js/chat.js?timespan=12456791171072154133132343243" charset="utf-8"></script>
     <!--<script type="text/javascript" src="/data/js/swfupload.js"></script>-->
     <!--<script type="text/javascript" src="/data/js/swfupload.queue.js"></script>-->
     <!--<script type="text/javascript" src="/data/js/fileprogress.js"></script>-->

public/data/js/chat.js

@@ -673,7 +673,7 @@ function sendMsg(content, type){
     msg.messageUrl="";
     msg.messageHref="";
     msg.messagePrice=1;
-
+console.log(msg);
     showNewMsg(msg);
     var sendData=Object();
      sendData.data=msg;

scripts/crontab/push/news_server.php

@@ -66,7 +66,6 @@ $serv->on('Message', function($server, $frame) use($conf){
             preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);
             $memberId= $matchs[1];
             $messageService=\Business\Message\MessageServiceModel::getInstance();
-
             $sendFd=$redis->hGet(KEY_PRE.$rev_data['toId'],'fd');
             $sendTime= $redis->hGet(KEY_PRE.$memberId,'sendTime');
             $diffTime=time()-$sendTime;
@@ -87,7 +86,7 @@ $serv->on('Message', function($server, $frame) use($conf){
                     $sendMessage['message']['type']=$rev_data['messageType'];
                     $strId=time().(string)$memberId;
                     $sendMessage['id']=(int)$strId;
-                    $sendMessage['message']['title']=$rev_data['messageTitle'];
+                    $sendMessage['message']['title']=(isset($rev_data['messageTitle'])&&!empty($rev_data['messageTitle']))?$rev_data['messageTitle']:'';
                     $sendMessage['message']['content']=$rev_data['messageContent'];
                     $sendMessage['message']['url']= isset($rev_data['messageUrl'])?$rev_data['messageUrl']:'';
                     $sendMessage['message']['href']=isset($rev_data['messageHref'])?$rev_data['messageHref']:'';
@@ -111,11 +110,11 @@ $serv->on('Message', function($server, $frame) use($conf){
                 //$redis->rPush("message_center",serialize($sendMessage));
                 $redis->hSet(KEY_PRE.$memberId,'sendTime', time());
                 $server->push($frame->fd, responseJson(1,"sendMsg","success", $sendMessage));
-                $messageService->addMessage($sendMessage['fromId'],$sendMessage['fromUserId'],$sendMessage['fromUserName'],$sendMessage['fromType'],$sendMessage['message'],$sendMessage['toId'],$sendMessage['toUserId'],$sendMessage['toUserName'],$sendMessage['toType'],$sendMessage['id']);;
-                unset($messageService);
-
-
+                $messageService->addMessage($sendMessage['fromId'],$sendMessage['fromUserId'],$sendMessage['fromUserName'],$sendMessage['fromType'],$sendMessage['message'],$sendMessage['toId'],$sendMessage['toUserId'],$sendMessage['toUserName'],$sendMessage['toType'],$sendMessage['id']);
             }
+            $messageService->unsetDb();
+            unset($messageService);
+            unset($redis);
         }else{
             $realKey = KEY_REDIS_PRE.$key;
             $sessData=$redis->get($realKey);
@@ -126,7 +125,8 @@ $serv->on('Message', function($server, $frame) use($conf){
             $res=$sessData;
            //echo $res;
             $matchs=array();
-            preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);
+            preg_match("/member_id\|i:(\d+)/i",$sessData,$matchs);//现在
+           // preg_match("/member_id\|i[^\d]{1,3}(\d+)/i",$res,$matchs);过去
             $memberId=$matchs[1];
             $redis->expire($realKey,\Our\ApiConst::tenDaySecond);
             if($memberId==(int)$memberId){