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

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'] = serialize($convert['message']);
             $id = time().(string)$this->orderIdStr.$data['orderId'];