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

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/library/Our/Push.php

@@ -107,6 +107,7 @@ class Push
             $convert['toUserName'] = $data['buyerName'];
             $convert['toType'] = ApiConst::memberMessageType;
             $convert['message'] = ArrayConst::orderCloseTemplate;
+            $convert['message']['content']=Common::format( $convert['message']['content'],$data['orderId']);
             $convert['message']['href'] = "orderId=" . $data['orderId'];
             $convert['message']['content']=Common::format($convert['message']['content'],$data['orderSn']);
             $convert['message'] = serialize($convert['message']);