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

application/controllers/Message.php

@@ -122,7 +122,11 @@ class MessageController extends \Our\Controller_AbstractApi {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::receiveError);
         }
     }
-
+    public function getUnreadCountAction(){
+        $messageService = \Business\Message\MessageServiceModel::getInstance();
+        $unreadCount=$messageService->getUnreadCountByMemberIdAndType($this->memberId);
+        $this->success(array('unreadCount'=>$unreadCount));
+    }
     public function setAction(){
         $messageService = \Business\Message\MessageServiceModel::getInstance();
         $type=$this->req['data']['type'];

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']*100,'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'],'shareDesc'=>$storeInfo['store_share_desc'],'memberId'=>$storeInfo['member_id']);
     }
 
     /**

application/models/Business/Goods/GroupSaleService.php

@@ -24,7 +24,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
      */
     public function getGroupGoods($param){
         $groupId = intval($param['groupId']);
-        $groupList = $this->getPBundlingListByBlIds(array($groupId));
+        $groupList = $this->getPBundlingListByBlIds(array($groupId),\Our\DbNameConst::salveDBConnectName,array(),false,\Our\ApiConst::one);
         if(!$groupList){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyPBundlingdForOrder);
         }
@@ -32,6 +32,8 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $data['state'] = \Our\ApiConst::cartGoodsOnline;
         if($data['bl_state'] == \Our\ApiConst::zero) {
             $data['state'] = \Our\ApiConst::zero;
+        }else if(isset($data['is_del'])&&$data['is_del']==\Our\ApiConst::one){
+            $data['state'] = \Our\ApiConst::cartGoodsOffline;
         }else if(!($data['bl_quota_starttime'] < time() && $data['endTime'] >= time())||!$data['goodsCountFlag']) {
             $data['state'] = \Our\ApiConst::cartGoodsOffline;
         }else if($data['bl_storage']<=\Our\ApiConst::zero) {

application/models/Business/Message/MessageService.php

@@ -88,7 +88,11 @@ class MessageServiceModel extends \Business\AbstractModel
 
 
     }
-
+    public function getUnreadCountByMemberIdAndType($toId){
+        $messageHistoryDao=\DAO\MessageHistoryModel::getInstance();
+        $count=$messageHistoryDao->getUnreadCountByToIdAndToType($toId);
+        return $count;
+    }
     /**
      * 根据消息类型获得一条消息，已经未读消息数量
      *
@@ -238,17 +242,17 @@ class MessageServiceModel extends \Business\AbstractModel
         $memberHistory = $memageHistoryDao->getOneById($messageHistoryId);
         $isSuccess = false;
         if ($memberHistory['fromId'] == $memberId) {
-            if ($memberHistory['status'] == ApiConst::recieveRemove) {
-                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'status', ApiConst::remove);
+            if ($memberHistory['isDel'] == ApiConst::recieveRemove) {
+                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'isDel', ApiConst::remove);
             } else {
-                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'status', ApiConst::sendRemove);
+                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'isDel', ApiConst::sendRemove);
             }
         }
         if ($memberHistory['toId'] == $memberId) {
-            if ($memberHistory['status'] == ApiConst::sendRemove) {
-                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'status', ApiConst::remove);
+            if ($memberHistory['isDel'] == ApiConst::sendRemove) {
+                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'isDel', ApiConst::remove);
             } else {
-                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'status', ApiConst::recieveRemove);
+                $isSuccess = $memageHistoryDao->update($messageHistoryId, 'isDel', ApiConst::recieveRemove);
             }
         }
         return $isSuccess;

application/models/Business/Order/OrderService.php

@@ -254,7 +254,9 @@ class OrderServiceModel extends \Business\AbstractModel
 
         $this->orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderId, $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond, array($orderId));
         //商店相关信息
-        $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $this->storeField), \Our\ApiConst::oneDaySecond);
+         $this->store=$storeDao->get($this->order['storeId']);
+        $this->store=Common::convertUnderline($this->store[0]);
+       // $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $this->storeField), \Our\ApiConst::oneDaySecond,array($this->order['storeId']));
         $returnData = $this->order;
         //配送员信息
         $this->diliveryman = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$diliverymanDao, 'findById'), array($returnData['diliverymanId']), \Our\ApiConst::oneDaySecond);
@@ -277,7 +279,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();
         }
-
+        $returnData['storeMemberId']=$this->store['memberId'];
         $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
         $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
         $returnData['reciverInfo'] = $this->address;

application/models/Business/Order/RefundService.php

@@ -217,6 +217,7 @@ class RefundServiceModel extends \Business\AbstractModel
         //退款原因列表
         $refundReasonDao = \DAO\Order\RefundReasonModel::getInstance();
         $storeDao = \DAO\StoreModel::getInstance();
+
         $refundReasonList = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$refundReasonDao, 'getAll'), array($this->refunReasonField), \Our\ApiConst::oneDaySecond);
         $shippingTypes = array_values(ArrayConst::refundShippingType);
         $refundTypes = array_values(ArrayConst::refundTypes);
@@ -228,11 +229,14 @@ class RefundServiceModel extends \Business\AbstractModel
         if (empty($orderInfo)) {
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
+
         //获得订单商品
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
         $orderGoodses = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderInfo['orderId'], $this->orderGoodsField), \Our\ApiConst::oneDaySecond);
         $orderGoodses = $orderGoodsDao->convertOrderGoods($orderGoodses, 'goodsId');
         $goodsIds = $orderGoodsDao->getRefundOrderGoodsIds($orderGoodses);
+        $this->store=$storeDao->get($this->order['storeId']);
+        $this->store=Common::convertUnderline($this->store[0]);
         if(!empty($orderGoodses[$goodsId])){
             $orderGoods = $orderGoodses[$goodsId];
         }
@@ -261,6 +265,7 @@ class RefundServiceModel extends \Business\AbstractModel
             'storeName'=>$orderInfo['storeName'],
             'storeId'=>$orderInfo['storeId'],
             'refundSeletedId'=>$orderDao->selectedTypeId($orderInfo),
+            'storeMemberId'=>$this->store['memberId']
         );
         $refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array();
         $returnData['needShippingFee'] = $orderInfo['needShippingFee'];
@@ -430,6 +435,7 @@ class RefundServiceModel extends \Business\AbstractModel
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance();
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
+        $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance();
         $refundReturn = $refundReturnDao->findByRefundId($returnId, $this->refundReturnField);
         $diliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
@@ -437,6 +443,8 @@ class RefundServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
         $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$orderGoodsDao, 'findByRecId'), array($refundReturn['orderGoodsId'], $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond);
+        $this->store=$storeDao->get($refundReturn['storeId']);
+        $this->store=Common::convertUnderline($this->store[0]);
         $refundReturn['goodsGroup'] = $goodsDao->getGoodsGroup($orderGoods['goodsGroup']);
         $refundReturn['goodsAttr'] = $goodsDao->getFormatGoodsAttr($orderGoods['goodsSpec']);
         $refundReturn['sellerStateName'] = ArrayConst::sellerState[$refundReturn['sellerState']];
@@ -447,8 +455,9 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']);
         }
         //平台操作类型
+        $refundReturn['storeMemberId']=$this->store['memberId'];
         $refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']];
-       $refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
+        $refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
         $refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
         $refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
         $addressDao = \DAO\Order\DAddressModel::getInstance();

application/models/Business/Store/StoreService.php

@@ -123,7 +123,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $favType = 1;
             }
         }
-        return array('storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'grade'=>$grade,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'favType'=>$favType,'monthlySalesCount'=>$monthlySalesCount,'defaultDeliveryTime'=>$defaultDeliveryTime,'freeShippingPrice'=>$storeInfo['free_shipping_price'] * 100,'storeDistance'=>$distince,'storeNotice'=>$storeInfo['store_notice'],'startShippingPrice'=>$storeInfo['start_shipping_price'] * 100,'memberId'=>$storeInfo['member_id'],'inStoreService'=>$in_store_service_flag,'adv'=>$adv,'memberId'=>$storeInfo['member_id']);
+        return array('storeLabel'=>$storeLabel,'storeName'=>$storeInfo['store_name'],'grade'=>$grade,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'favType'=>$favType,'monthlySalesCount'=>$monthlySalesCount,'defaultDeliveryTime'=>$defaultDeliveryTime,'freeShippingPrice'=>$storeInfo['free_shipping_price'],'storeDistance'=>$distince,'storeNotice'=>$storeInfo['store_notice'],'startShippingPrice'=>$storeInfo['start_shipping_price'],'memberId'=>$storeInfo['member_id'],'inStoreService'=>$in_store_service_flag,'adv'=>$adv,'memberId'=>$storeInfo['member_id']);
     }
 
     /**

application/models/DAO/MessageHistory.php

@@ -38,12 +38,19 @@ class MessageHistoryModel extends \DAO\AbstractModel {
      *
      */
     public function getListByMemberIdAndToIdAndToType($memberId,$selfType,$toId,$toType,$field='*',$pageIndex=0,$pageSize=20){
-        $where=Common::format(" ((fromId={0} and toId={1} and toType={2} and fromType={3} and status<>2) or (fromId={4} and toId={5}  and fromType={6} and toType={7} and status<>3)) and status<>-1",$memberId,$toId,$toType,$selfType,$toId,$memberId,$toType,$selfType);
+        $where=Common::format(" ((fromId={0} and toId={1} and toType={2} and fromType={3} and isDel not in(-1,2)) or (fromId={4} and toId={5}  and fromType={6} and toType={7} and isDel not in(-1,3)))",$memberId,$toId,$toType,$selfType,$toId,$memberId,$toType,$selfType);
         parent::setDb();
         $messages=$this->lists($where,array('gmtCreate'=>'desc'),$field,$pageIndex,$pageSize);
         return $messages;
     }
 
+    public function getUnreadCountByToIdAndToType($toId,$toType){
+        $this->setDb($this->dbName);
+        $where=Common::format(" (toId={0} and status ={2})",$toId,$toType,ApiConst::unread);
+        $num=$this->db->from($this->_tableName)->select("count(*) as count")->where($where)->fetchNum();
+        return $num?$num:ApiConst::zero;
+    }
+
     public function getOneById($id,$field='*'){
         parent::setDb();
         $where[$this->_primaryKey]=$id;
@@ -65,7 +72,7 @@ class MessageHistoryModel extends \DAO\AbstractModel {
     }
 
     public function updateByFromIdAndSelfTypeAndToIdAndToType($fromId,$fromType,$toId,$toType){
-        $where=Common::format(" (((fromId={0} and toId={1} and toType={2} and fromType={3}) or (toId={2} and fromId={3} and fromType={0} and toType={1}))  and status=0)",$toId,$fromId,$fromType,$toType);
+        $where=Common::format(" (((fromId={0} and toId={1} and toType={2} and fromType={3}) and status=0))",$toId,$fromId,$fromType,$toType);
         $data['status']=ApiConst::read;
         return $this->updateByWhere($where,$data);
     }

public/test/message/getUnreadCount.php

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>获得已发送消息的用户列表和(系统消息，订单消息，快递用户消息最后一条消息）</title>
+    <style>
+    </style>
+
+</head>
+<body>
+<form action="/message/getUnreadCount" method="post">
+    用户登录状态key:<input name="data[key]" value="fd4b739c4815297044191451eabf0eb5"/><br />
+
+    <input type="submit" value="提交">
+</form>
+
+</body>
+</html>
\ No newline at end of file