Merge remote-tracking branch 'origin/yijia' into yijia

addons/unishop/controller/Pay.php

@@ -115,13 +115,13 @@ class Pay extends Base
     /**
      * 支付通知回调
      */
-    public function aliNotify()
+    public function notify()
     {
         // 添加行为
         Hook::add('paid_success', 'addons\\unishop\\behavior\\Order');
         Hook::add('paid_fail', 'addons\\unishop\\behavior\\Order');
 
-        $paytype = "alipay";
+        $paytype = $this->request->param('type');
         file_put_contents(ROOT_PATH . '/runtime/log/' . date('Ym') ."/".date("d"). '.log', $paytype . PHP_EOL, FILE_APPEND);
         $pay = Service::checkNotify($paytype);
         if (!$pay) {