pc

application/models/Business/Store/ShopkeeperService.php

@@ -481,13 +481,21 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $this->taskSize=PageConst::taskPageSize;
         do{
             $addDatas=array();
-            $where['add_time']=Common::format(" add_time>={0} and add_time<",$beginTime,TIMESTAMP);
-            $orders=$orderDao->getList($where, $orderDao->_primaryKey, $this->taskIndex, $this->taskSize, $orderField = 'add_time', $sort = 'desc');
+            $where=Common::format(" add_time>={0} and add_time<{1}  ",$beginTime,TIMESTAMP);
+            $orders=$orderDao->getList($where, 'order_id as orderId,delete_state as deleteState,order_sn as orderSn', $this->taskIndex, $this->taskSize, array( 'add_time'=>'desc'));
             if(!empty($orders['list'])){
-                $orderIds=array_column($orders['list'],$orderDao->_primaryKey);
-                $resultOrders=array();
-                foreach($orders as $order){
-                    
+                $indexs=array();
+                $orderIds=array_column($orders['list'],'orderId');
+                $orderGoods=$orderGoodDao->getOrderGoodsByOrderIds($orderIds,'order_id as orderId,goods_name as goodsName');
+                $resultOrders=Common::intergrateOneToMany($orders['list'], $orderGoods, 'orderId', 'orderId', 'orderGoods');
+                foreach($resultOrders as $result){
+                    $one['orderId']=$result['orderId'];
+                    $one['orderSn']=$result['orderSn'];
+                    $namesArr=array_column($result['orderGoods'],'goodsName');
+                    $nameStr=implode(',',$namesArr);
+                    $one['goodsName']=$nameStr;
+                    $one['orderId']=$result['orderId'];
+                    array_push($indexs,$one);
                 }
             }
             $storeMemberStatisticData= $orderGoodDao->getMemberStoreStaticsByCreateTime($beginTime,$this->taskIndex,$this->taskSize);

scripts/crontab/push/news_server.php

@@ -58,13 +58,13 @@ $serv->on('Message', function($server, $frame) use($conf){
             $rev_data=$rev_data['data'];
             $realKey = KEY_REDIS_PRE.$key;
             $sessData=$redis->get($realKey);
-            $sessDataSpilt1=explode(';',$sessData);
-            $sessDataSpilt2=explode('|',$sessDataSpilt1[1]);
-            $sessDataSpilt3=explode(':', $sessDataSpilt2[1]);
-            $res= $sessDataSpilt3[1];
+//            $sessDataSpilt1=explode(';',$sessData);
+//            $sessDataSpilt2=explode('|',$sessDataSpilt1[1]);
+//            $sessDataSpilt3=explode(':', $sessDataSpilt2[1]);
+//            $res= $sessDataSpilt3[1];
             $matchs=array();
-            preg_match("/\d+/i",$res,$matchs);
-            $memberId= $matchs[0];
+            preg_match("/member_id\|i:(\d+)/i",$res,$matchs);
+            $memberId= $matchs[1];
             $messageService=\Business\Message\MessageServiceModel::getInstance();
 
             $sendFd=$redis->hGet(KEY_PRE.$rev_data['toId'],'fd');