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

application/controllers/Index.php

@@ -52,8 +52,8 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
-        $clientPush=\JPush\ClientPush::getInstance();
-        $clientPush->pushAll();
+//        $clientPush=\JPush\ClientPush::getInstance();
+//        $clientPush->pushAll();
         echo 'success';
         exit;
         \Our\Log::getInstance()->write('testLog|||||testLog');

application/controllers/Message.php

@@ -21,9 +21,19 @@ class MessageController extends \Our\Controller_AbstractApi {
         $pageIndex=isset($this->req['data']['pageIndex'])?$this->req['data']['pageIndex']:0;
         $pageSize=isset($this->req['data']['pageSize'])?$this->req['data']['pageSize']:20;
         if(!empty($this->req['data']['toType'])){
-            $returnMessage=\Our\RedisHelper::cachedFunction(\Redis\Db15\MessageRedisModel::getInstance(),array(&$this->messageService, 'getMemberList'),array($this->memberId,$this->req['data']['fromType'],$this->req['data']['toId'],$this->req['data']['toType'],'*',$pageIndex,$pageSize),\Our\ApiConst::tenSecond,array($this->memberId));
+            if(!empty($this->req['data']['otherId'])){
+                $otherId=$this->req['data']['otherId'];
+            }else{
+                $otherId=\Our\ApiConst::zero;
+            }
+            if(empty($this->req['data']['toId'])){
+                $this->req['data']['toId']=\Our\ApiConst::zero;
+            }
+            $returnMessage=$this->messageService->getMemberList($this->memberId,$this->req['data']['fromType'],$this->req['data']['toId'],$otherId,$this->req['data']['toType'],'*',$pageIndex,$pageSize);
+           // $returnMessage=\Our\RedisHelper::cachedFunction(\Redis\Db15\MessageRedisModel::getInstance(),array(&$this->messageService, 'getMemberList'),array($this->memberId,$this->req['data']['fromType'],$this->req['data']['toId'],$this->req['data']['toType'],'*',$pageIndex,$pageSize),\Our\ApiConst::oneHour,array($this->memberId));
         }else{
-            $returnMessage=\Our\RedisHelper::cachedFunction(\Redis\Db15\MessageRedisModel::getInstance(),array(&$this->messageService, 'getList'),array($this->memberId,$pageIndex,$pageSize),\Our\ApiConst::tenSecond,array($this->memberId));
+            $returnMessage=$this->messageService->getList($this->memberId,$pageIndex,$pageSize);
+           // $returnMessage=\Our\RedisHelper::cachedFunction(\Redis\Db15\MessageRedisModel::getInstance(),array(&$this->messageService, 'getList'),array($this->memberId,$pageIndex,$pageSize),\Our\ApiConst::oneHour,array($this->memberId));
             if($returnMessage){
                 $returnMessage['users']=$returnMessage['list'];
             }else{
@@ -141,6 +151,7 @@ class MessageController extends \Our\Controller_AbstractApi {
         }
         \Error\ErrorModel::throwException(\Error\CodeConfigModel::setMessageFail);
     }
+
     public function getSetAction(){
         $memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
         $messageSet=$memberCenterService->getMessageSet($this->memberId);

application/library/Our/ArrayConst.php

@@ -37,6 +37,14 @@ class ArrayConst
         ApiConst::qqPayType,
         ApiConst::wxLitePayType
     );
+    const paymentTypes=array(
+        ApiConst::offlinePay=>'线下付款',
+        ApiConst::wxpay=>'微信付款',
+        ApiConst::afterSendPay=>'货到付款',
+        ApiConst::alipay=>'支付宝付款',
+        ApiConst::tenpay=>'qq支付',
+        ApiConst::wxProgram=>'微信付款',
+    );
     const orderPayTypeOnlines=array(
         ApiConst::wxpay,
         ApiConst::alipay,

application/library/Our/DescribeConst.php

@@ -143,7 +143,8 @@ class DescribeConst
     const payOnlineName = '线上支付'; //线上支付
     const payOfflineName = '线下支付'; //线下支付
     const payAogName = '货到付款'; //货到付款
-
+    const payed = '已付款'; //货到付款
+    const notPayed = '未付款'; //货到付款
     const refund='退款';
     const refundRetund='退货';
 

application/library/Our/Push.php

@@ -108,6 +108,7 @@ class Push
             $convert['toType'] = ApiConst::memberMessageType;
             $convert['message'] = ArrayConst::orderCloseTemplate;
             $convert['message']['href'] = "orderId=" . $data['orderId'];
+            $convert['message']['content']=Common::format($convert['message']['content'],$data['orderSn']);
             $convert['message'] = serialize($convert['message']);
             $id = time().(string)$this->orderIdStr.$data['orderId'];
             $convert['id'] =$id;
@@ -188,14 +189,31 @@ class Push
           array_push($buttons,$button);
           return $buttons;
 
+    }
+    public function getOrderMessageContent($orderDetail){
+        $messageContent='商品名称:';
+        foreach($orderDetail['orderGoods'] as $orderGood){
+            $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
+        }
+        $messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n";
+        $messageContent.='付款状态:'.(ArrayConst::paymentTypes[$orderDetail['paymentTime']]>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed)."\n";
+        $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
+        $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
+        $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
+        return $messageContent;
+
     }
     //店铺接单
     public function recieveWait($storeId,$orderId,$orderSn)
     {
         $storeDao=\DAO\StoreModel::getInstance();
-        $store = $storeDao->getInfo(array('store_id'=>$storeId));
+        $condition['store_id'] = $storeId;
+        $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfo'), array($condition), ApiConst::oneDaySecond, array($storeId));
+        //$store = $storeDao->getInfo(array('store_id'=>$storeId));
+        $orderService=\Business\Order\OrderServiceModel::getInstance();
+        $orderDetail=$orderService->getOrderDetail($orderId);
         $toUserId=$storeId;
-        $messageContent=Common::format(DescribeConst::recieveWaitContent,$orderSn);
+        $messageContent=$this->getOrderMessageContent($orderDetail);
         $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
         $href=Common::format(PathConst::orderId,$orderId);
         $buttons=$this->getComfirmRecieveButtons($orderId);

application/models/Business/Message/MessageService.php

@@ -25,6 +25,7 @@ class MessageServiceModel extends \Business\AbstractModel
     public $memberId;
     private $memberMessageField = 'message_id,message_title,message_body,message_type,tpl_type,record_id';
     private $baseRedis;
+
     public function init()
     {
 
@@ -88,11 +89,14 @@ class MessageServiceModel extends \Business\AbstractModel
 
 
     }
-    public function getUnreadCountByMemberIdAndType($toId){
-        $messageHistoryDao=\DAO\MessageHistoryModel::getInstance();
-        $count=$messageHistoryDao->getUnreadCountByToIdAndToType($toId);
+
+    public function getUnreadCountByMemberIdAndType($toId)
+    {
+        $messageHistoryDao = \DAO\MessageHistoryModel::getInstance();
+        $count = $messageHistoryDao->getUnreadCountByToIdAndToType($toId);
         return $count;
     }
+
     /**
      * 根据消息类型获得一条消息，已经未读消息数量
      *
@@ -133,19 +137,20 @@ class MessageServiceModel extends \Business\AbstractModel
         }
         if ($type == ApiConst::storeMessageType) {
             $store = \DAO\StoreModel::getInstance();
-            $storeData=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$store, 'getInfoById'), array($userid, $store->detailField), \Our\ApiConst::oneDaySecond);
-            $avatar=$storeData['storeLabel'];
-           // $avatar = $store->getInfoById($userid, 'store_label', 'store_label');
+            $storeData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$store, 'getInfoById'), array($userid, $store->detailField), \Our\ApiConst::oneDaySecond);
+            $avatar = $storeData['storeLabel'];
+            // $avatar = $store->getInfoById($userid, 'store_label', 'store_label');
             $avatar = Common::getStaticFile($avatar, ImageConst::storeLabel, ImageConst::imageDomain);
         }
 
-        if ($type == ApiConst::memberMessageType || $type==ApiConst::serviceMessageType) {
+        if ($type == ApiConst::memberMessageType || $type == ApiConst::serviceMessageType) {
             $member = \DAO\MemberModel::getInstance();
             $memerAvatar = $member->getInfo($userid, 'member_avatar');
             $avatar = $member->getMemberAvatarUrl($userid, $memerAvatar);
         }
         return $avatar;
     }
+
     public function __destruct()
     {
         $store = \DAO\StoreModel::getInstance();
@@ -158,7 +163,8 @@ class MessageServiceModel extends \Business\AbstractModel
         $mesageOneDao->unsetDb();
     }
 
-    public function unsetDb(){
+    public function unsetDb()
+    {
         $store = \DAO\StoreModel::getInstance();
         $member = \DAO\MemberModel::getInstance();
         $messageHistoryDao = \DAO\MessageHistoryModel::getInstance();
@@ -177,13 +183,13 @@ class MessageServiceModel extends \Business\AbstractModel
     public function getList($memberId, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize)
     {
         $messageOneDao = \DAO\MessageOneModel::getInstance();
-        $messageHistoryDao=\DAO\MessageHistoryModel::getInstance();
+        $messageHistoryDao = \DAO\MessageHistoryModel::getInstance();
         $messageOneList = $messageOneDao->getListByMemberId($memberId, '*', $pageIndex, $pageSize);
         foreach ($messageOneList['list'] as &$val) {
             $self = $this->getUserByMemberIdAndSelfType($val['fromId'], $val['fromType']);
             $toMember = $this->getUserByMemberIdAndSelfType($val['toId'], $val['toType']);
             $val['toAvatar'] = $toMember['avatar'];
-            $val['message'] =$messageHistoryDao->convertMessage($val['message']);
+            $val['message'] = $messageHistoryDao->convertMessage($val['message']);
             $val['fromAvatar'] = $self['avatar'];
 //                $val['toAvatar']=$this->getAvatar($val['toType'],$val['toId']);
 //                $val['fromAvatar']=$this->getAvatar($val['fromType'],$val['fromId']);
@@ -204,7 +210,7 @@ class MessageServiceModel extends \Business\AbstractModel
             $member['uid'] = $store['store_id'];
             $member['name'] = $store['store_name'];
         }
-        if ($type == ApiConst::memberMessageType || $type==ApiConst::serviceMessageType) {
+        if ($type == ApiConst::memberMessageType || $type == ApiConst::serviceMessageType) {
             $memberDao = \DAO\MemberModel::getInstance();
             $member = $memberDao->getOneByMemberId($memberId, 'member_id,member_name');
             $member['uid'] = $member['member_id'];
@@ -215,16 +221,30 @@ class MessageServiceModel extends \Business\AbstractModel
         return $member;
     }
 
+    public function getMemberIdByOtherIdAndType($otherId, $type)
+    {
+        if($type==ApiConst::storeMessageType){
+            $storeDao=\DAO\StoreModel::getInstance();
+            $condition['store_id'] = $otherId;
+            $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfo'), array($condition), ApiConst::oneDaySecond, array($otherId));
+            return $store['member_id'];
+        }
+        ErrorModel::throwException(CodeConfigModel::paramsError);
+    }
+
     /**
      * 根据用户的消息类型获得消息列表
      *
      * @ccw
      */
-    public function getMemberList($memberId, $selfType, $toId, $toType = ApiConst::systemMessageType, $field = '*', $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize)
+    public function getMemberList($memberId, $selfType, $toId, $otherId, $toType = ApiConst::systemMessageType, $field = '*', $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize)
     {
         $messageHistory = \DAO\MessageHistoryModel::getInstance();
         $self = $this->getUserByMemberIdAndSelfType($memberId, $selfType);
         $toMember = $this->getUserByMemberIdAndSelfType($toId, $toType);
+        if (empty($toId)) {
+            $toId =$this->getMemberIdByOtherIdAndType($otherId,$toType);
+        }
         $returnMemeber['toId'] = (int)$toId;
         $returnMemeber['toUserId'] = (int)$toMember['uid'];
         $returnMemeber['toUserName'] = $toMember['name'];
@@ -238,7 +258,6 @@ class MessageServiceModel extends \Business\AbstractModel
         $memberMessages = $messageHistory->getListByMemberIdAndToIdAndToType($memberId, $selfType, $toId, $toType, $field, $pageIndex, $pageSize);
         foreach ($memberMessages['list'] as &$val) {
             $val['message'] = $messageHistory->convertMessage($val['message']);
-
         }
         $memberMessages['list'] = array_reverse($memberMessages['list']);
         $returnMemeber['messages'] = $memberMessages;
@@ -330,7 +349,7 @@ class MessageServiceModel extends \Business\AbstractModel
         $message['gmtCreate'] = TIMESTAMP;
         $message['isRead'] = ApiConst::unread;
         $message['type'] = (int)$message['type'];
-        $message['content']=base64_encode($message['content']);
+        $message['content'] = base64_encode($message['content']);
         $serializeMessage = serialize($message);
         //将消息添加到表messageHistory
         $mesageHistory['fromId'] = $fromId;
@@ -389,7 +408,7 @@ class MessageServiceModel extends \Business\AbstractModel
             $this->baseRedis->auth($conf['password']);
         }
         while ($center = $this->baseRedis->lPop('message_center')) {
-            $this->baseRedis->rPush('push_center',$center);
+            $this->baseRedis->rPush('push_center', $center);
             $addData = unserialize($center);
             $addData['message'] = unserialize($addData['message']);
             $this->addMessage($addData['fromId'], $addData['fromUserId'], $addData['fromUserName'], $addData['fromType'], $addData['message'], $addData['toId'], $addData['toUserId'], $addData['toUserName'], $addData['toType'], $addData['id']);
@@ -452,9 +471,11 @@ class MessageServiceModel extends \Business\AbstractModel
             return false;
         }
     }
-    public function set($memberId,$pushData){
-        $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
-        if($memberDao->setIsWxsend($memberId,$pushData)!==false){
+
+    public function set($memberId, $pushData)
+    {
+        $memberDao = \DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
+        if ($memberDao->setIsWxsend($memberId, $pushData) !== false) {
             return true;
         }
         return false;

application/models/Business/Order/OrderService.php

@@ -282,6 +282,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['storeMemberId']=$this->store['memberId'];
         $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
         $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
+        $this->address['address']=$orderCommonDao->convertReceiveAddress($this->address['address']);
         $returnData['reciverInfo'] = $this->address;
         $returnData['reciverInfo']['lng']=!empty($returnData['reciverInfo']['lng'])?$returnData['reciverInfo']['lng']:ApiConst::zero;
         $returnData['reciverInfo']['lat']=!empty($returnData['reciverInfo']['lat'])?$returnData['reciverInfo']['lat']:ApiConst::zero;
@@ -786,7 +787,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['mobPhone'] = $delivery['mobPhone'] ? $delivery['mobPhone'] : '';
                 $delivery['finishTime'] = $delivery['finishTime'] ? $delivery['finishTime'] : ApiConst::zero;
                 $delivery['orderGoods'] = !empty($goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']))?$goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']):array();
-                $delivery['street'] = $delivery['reciverInfo']['address'];
+                $delivery['street'] =$orderCommonDao->convertReceiveAddress($delivery['reciverInfo']['address']);
                 $delivery['lng'] = $delivery['reciverInfo']['lng'] ? $delivery['reciverInfo']['lng'] : 0.0;
                 $delivery['lat'] = $delivery['reciverInfo']['lat'] ? $delivery['reciverInfo']['lat'] : 0.0;
                 $delivery['subAddress'] = isset($delivery['reciverInfo']['sub_address']) ? $delivery['reciverInfo']['sub_address'] : '';
@@ -868,7 +869,7 @@ class OrderServiceModel extends \Business\AbstractModel
             'getTime' => $delivery['getTime'],
             'reciverName' => $this->orderCommon['reciverName'],
             'mobPhone' => $reciverInfo['mob_phone'],
-            'street' => $reciverInfo['address'],
+            'street' =>$orderCommonDao->convertReceiveAddress($reciverInfo['address']),
             'lng' => isset($reciverInfo['lng']) ? $reciverInfo['lng'] : ApiConst::zero,
             'lat' => isset($reciverInfo['lat']) ? $reciverInfo['lat'] : ApiConst::zero,
             'subAddress' => isset($reciverInfo['sub_address'])?$reciverInfo['sub_address']:'',

application/models/DAO/Order/OrderCommon.php

@@ -78,6 +78,12 @@ class OrderCommonModel extends \DAO\AbstractModel
         return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getAllByOrderIds'), array($orderIds, $field), ApiConst::oneDaySecond, array($deliveryId));
     }
 
+
+    public function convertReceiveAddress($address){
+        $search = array(" ","　","\n","\r","\t");
+        $replace = array("","","","","");
+        return str_replace($search, $replace, $address);
+    }
     public function insert($data)
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);

scripts/crontab/order/pushWaitRecieve.php

@@ -77,7 +77,7 @@ class cliPushWaitRecieveOrder extends basecli
         }
         $this->bDoUnLock = true;
         file_put_contents($this->lockFileName ,"running" ); // CLI 独占锁
-        $this->pushWaitOrder();
+       // $this->pushWaitOrder();
 
         echo '等待接单订单发送成功'."\r\n";
     }

scripts/crontab/push/bridge.php

@@ -15,6 +15,7 @@ $http->on('request', function ($request, $response) {
     try{
         $respData=$request->post;
         echo json_encode($respData);
+        echo 'abcdefg'.'|||||||||||';
         if(isset($respData['type'])&&$respData['type']==1){
             $info=$respData['content'];
             $memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName);