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

application/models/Business/Goods/EvaluationService.php

@@ -251,7 +251,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
         $evaluateInstance = \DAO\EvaluateGoodsModel::getInstance();
         do{
-            $list = $orderDao->getList(array('finnshed_time'=>array('elt',time()-(\Our\ApiConst::oneDaySecond)),'evaluation_state'=>\Our\ApiConst::waitEvaluation,'order_state'=>\Our\ApiConst::orderStateComplete,'delete_state'=>0,'lock_state'=>0),'order_id,buyer_id,buyer_name,store_name,store_id,order_sn,order_id,diliveryman_id',$pageBegin,\Our\PageConst::taskPageSize,'');
+            $list = $orderDao->getList(array('finnshed_time'=>array('elt',time()-(\Our\ApiConst::sevenDaySecond)),'evaluation_state'=>\Our\ApiConst::waitEvaluation,'order_state'=>\Our\ApiConst::orderStateComplete,'delete_state'=>0,'lock_state'=>0),'order_id,buyer_id,buyer_name,store_name,store_id,order_sn,order_id,diliveryman_id',$pageBegin,\Our\PageConst::taskPageSize,'');
             foreach ($list['list'] as $order) {
                 $orderGoods = $orderGoodsDao->getOrderGoodsList(array('order_id'=>$order['order_id'],'refund_id'=>0),'rec_id,goods_id,goods_commonid,goods_name,goods_image,goods_pay_price,goods_num,goods_spec');
                 $evaluations = array();

application/models/Business/User/MemberCenterService.php

@@ -4,7 +4,7 @@ namespace Business\User;
 
 use Our\ApiConst;
 use Our\NameConst;
-class MemberCenterServiceModel extends \Business\AbstractModel
+class  MemberCenterServiceModel extends \Business\AbstractModel
 {
 
 
@@ -88,9 +88,10 @@ class MemberCenterServiceModel extends \Business\AbstractModel
             //待发货数量
             $memberCenter[NameConst::waitShipments] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitSend,'buyer_id'=>$memberId));
             //待收货数量
-            $memberCenter[NameConst::waitReceiving] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId));
+            $memberCenter[NameConst::waitReceiving] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId,'shipping_type'=>1));
+            $memberCenter[NameConst::waitReceiving] = $orderDAO->getCount(array('order_state = '.ApiConst::orderStateWaitRecieve.' OR order_state = '.ApiConst::orderStateWaitSend,'buyer_id = '.$memberId,'shipping_type = 1'),false);
             //待自提数量
-            $memberCenter[NameConst::waitSelfLifting] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
+            $memberCenter[NameConst::waitSelfLifting] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId,'shipping_type'=>0));
             //待评价数量
             $memberCenter[NameConst::waitEvaluate] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId,'shipping_type'=>ApiConst::bySelf));
             //退款中数量
@@ -101,39 +102,39 @@ class MemberCenterServiceModel extends \Business\AbstractModel
             $memberCenter[NameConst::goodsCollection] = \DAO\FavoritesModel::getInstance()->getFavoritesCountWithCommon(null, $memberId);
             //足迹数量
             $memberCenter[NameConst::footprint] = \DAO\GoodsBrowseModel::getInstance()->getBrowseCount(array('member_id'=>$memberId));
-            $memebrCenterDb1Redis->tableHMSet($memberId,$memberCenter,\Our\ApiConst::sevenDaySecond);
+            $memebrCenterDb1Redis->tableHMSet($memberId,$memberCenter,\Our\ApiConst::oneDaySecond);
         }else{
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::footprint) === false){
                 $memberCenter[NameConst::footprint] = \DAO\GoodsBrowseModel::getInstance()->getBrowseCount(array('member_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::footprint,$memberCenter[NameConst::footprint],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::footprint,$memberCenter[NameConst::footprint],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::goodsCollection) === false){
                 $memberCenter[NameConst::goodsCollection] = \DAO\FavoritesModel::getInstance()->getFavoritesCountWithCommon(null, $memberId);
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::goodsCollection,$memberCenter[NameConst::goodsCollection],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::goodsCollection,$memberCenter[NameConst::goodsCollection],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitPay) === false){
                 $memberCenter[NameConst::waitPay] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitPay,'buyer_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitPay,$memberCenter[NameConst::waitPay],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitPay,$memberCenter[NameConst::waitPay],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitShipments) === false){
                 $memberCenter[NameConst::waitShipments] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitSend,'buyer_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitShipments,$memberCenter[NameConst::waitShipments],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitShipments,$memberCenter[NameConst::waitShipments],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitReceiving) === false){
-                $memberCenter[NameConst::waitReceiving] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitReceiving,$memberCenter[NameConst::waitReceiving],\Our\ApiConst::sevenDaySecond);
+                $memberCenter[NameConst::waitReceiving] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state = '.ApiConst::orderStateWaitRecieve.' OR order_state = '.ApiConst::orderStateWaitSend,'buyer_id = '.$memberId,'shipping_type = 1'),false);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitReceiving,$memberCenter[NameConst::waitReceiving],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitSelfLifting) === false){
-                $memberCenter[NameConst::waitSelfLifting] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitSelfLifting,$memberCenter[NameConst::waitSelfLifting],\Our\ApiConst::sevenDaySecond);
+                $memberCenter[NameConst::waitSelfLifting] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId,'shipping_type'=>0));
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitSelfLifting,$memberCenter[NameConst::waitSelfLifting],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitEvaluate) === false){
                 $memberCenter[NameConst::waitEvaluate] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitEvaluate,$memberCenter[NameConst::waitEvaluate],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitEvaluate,$memberCenter[NameConst::waitEvaluate],\Our\ApiConst::oneDaySecond);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::refund) === false){
                 $memberCenter[NameConst::refund] = \DAO\Order\RefundReturnModel::getInstance()->getCount('refund_state != '.ApiConst::refundStateComplete.' AND buyer_id = '.$memberId);
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::refund,$memberCenter[NameConst::refund],\Our\ApiConst::sevenDaySecond);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::refund,$memberCenter[NameConst::refund],\Our\ApiConst::oneDaySecond);
             }
             foreach ($memberCenter as &$v){
                 $v = (int)$v;

application/models/Business/User/ShareService.php

@@ -93,8 +93,8 @@ class ShareServiceModel extends \Business\AbstractModel
                     $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                     return $url;
                 }else{
-                   // return $this->getQrUrl($data['id']);
-                    return PathConst::wxDefaultPath;
+                   return $this->getQrUrl($data['id']);
+                   // return PathConst::wxDefaultPath;
                 }
             }else{
                 return $this->getQrUrl($data['id']);
@@ -115,8 +115,8 @@ class ShareServiceModel extends \Business\AbstractModel
                         $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                         return $url;
                     }else{
-                        //return $this->getQrUrl($data['id']);
-                        return PathConst::wxDefaultPath;
+                        return $this->getQrUrl($data['id']);
+                        //return PathConst::wxDefaultPath;
                     }
             }else{
                 //不是微信分享就是普通下载的二维码图片

application/models/DAO/Order/Order.php

@@ -57,7 +57,7 @@ class OrderModel extends \DAO\AbstractModel
     {
         $this->setDb();
         if (!$isArray) {
-            $str = '$count =  $this->db->from($this->_tableName)->where(delete_state = 0)';
+            $str = '$count =  $this->db->from($this->_tableName)->where("delete_state = 0")';
             foreach ($where as $v) {
                 $str .= "->where('$v')";
             }

public/data/js/chat.js

@@ -37,7 +37,7 @@ function listenEvent() {
     /**
      * 连接建立时触发
      */
-    ws.onopen = function (e) {
+    ws.onopen = function (e) {a
         console.log(e.data);
         var msg = {"method":"join","key":key};
         ws.send($.toJSON(msg));