wx callback

Application/Callback/Controller/NotifyController.class.php

@@ -290,13 +290,18 @@ class NotifyController extends BaseController
             $this->record_logs("return_code返回数据错误");
             exit();
         } else {
-            $payData = $this->getPayConfByOrderId($reqdata['out_trade_no']);
+
-            if ($payData['code'] != 0) {
+            $merchant = M('payment_merchant', 'tab_')->where([
-                $this->record_logs($payData['msg']);
+                'identifier' => $reqdata['mch_id']
+            ])->find();
+            if (!$merchant) {
+                $this->record_logs("找不到商户！".$reqdata['mch_id']);
+                echo 'fail';
                 exit();
             }
-            $payConf = $payData['data'];
+
-            
+            $payConf = json_decode($merchant['config'], true);
+
             if ($_REQUEST['method'] == "notify2") {//sdk
                 $Common_util_pub = new \Common_util_pub(C('wei_xin_app.email'), C('wei_xin_app.partner'), C('wei_xin_app.key'));
             } elseif ($_REQUEST['method'] == "notify3") { //app