order_sort

application/models/DAO/Order/OrderGoods.php

@@ -260,6 +260,24 @@ class OrderGoodsModel extends \DAO\AbstractModel {
         $res=$this->db->from($this->_tableName)->select($this->sumGoodsNum)->where($where)->group("buyer_id")->group("store_id")->fetchAll();
         return $res;
 
+    }
+    public function getMemberStoreOrderGoodsCountBak($storeIds,$memberIds){
+        $this->setDb($this->dbName);
+        $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
+        $whereOrder['store_id']=array('in',$storeIds);
+        $whereOrder['buyer_id']=array('in',$memberIds);
+        $whereOrder['order_state']=array('in',ArrayConst::orderCloseAndCancel);
+        $orderIds=$orderDao->getFieldByWhere($whereOrder,'order_id');
+        $where['store_id']=array('in',$storeIds);
+        $where['buyer_id']=array('in',$memberIds);
+        $where['is_refund']=array('neq',ApiConst::refundSuccess);
+        if($orderIds){
+            $where['order_id']=array('notin',$orderIds);
+        }
+        $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;
+
     }
     public function convertRefundOrderGoods($orderGoods,$orderGoodsId){
         $newOrderGoods=Array();

scripts/crontab/push/jpush.php

@@ -84,8 +84,21 @@ class cliOrderClose extends basecli
             $stores=$goodsCommonService->getGoodsCount($storesIds);
             if(!empty($stores)){
                 foreach($stores as $store){
-                    $addData=array('storeId'=>$store['storeId'],'type'=>\Our\ApiConst::messageGoodsAlert,'op'=>\Our\NameConst::set,'alertCount'=>$store['count'],'params'=>array());
-                    $push->addOneToClient($addData);
+                    $push=\Our\Push::getInstance();
+                    $pushData=array('storeId'=>$store['storeId'],
+                        'type'=>\Our\ApiConst::messageGoodsAlert,
+                        'waitReceiveCount'=>ApiConst::zero,
+                        'waitDeliveryCount'=>0,
+                        'waitGetCount'=>0,
+                        'orderCount'=>ApiConst::zero,
+                        'waitRefundProccessCount'=>ApiConst::zero,
+                        'waitRefundReceiveCount'=>ApiConst::zero,
+                        'refundCount'=>ApiConst::zero,
+                        'alertCount'=>$store['count'],
+                        'params'=>array('c'=>'shopkeeper',
+                            'm'=>'orderDetail',
+                            'orderId'=>$store['orderId']));
+                    $push->addOneToClient($pushData);
                 }
 
             }