diff --git a/webapp/controller/MerchantController.class.php b/webapp/controller/MerchantController.class.php
new file mode 100644
index 0000000..a4d4dd8
--- /dev/null
+++ b/webapp/controller/MerchantController.class.php
@@ -0,0 +1,99 @@
+<?php
+
+class MerchantController {
+
+    const SCAN_PAY_API_URL = 'https://gwapi.yemadai.com/pay/aggregatePay';
+    const PRI_KEY = 'MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALaDZP3ysvKxkBLWlW/aAT/YM5/34uQcj2gQVV4q9Vkoscw3MSlmRcr4hckwenGUw0tK2LC4vEume8JBCm0ZsWiGoOwcAJp16Zzr+35hUXYVfgXoYiAG5o8N0nBIYCWO1Tk/e+wJsmkY9eHpA3Iq94EAkogttd6bqk+X4nTUIxfJAgMBAAECgYB3pECC3CMERvOr9bC2RtGE2aRV2/iHElXLoNFlToHQ9YU/2npGqj1cJXgF/9p0NFGlPKY5ipAcg0EjgOFlzW7me9C/wC7x704+WMsqZu7POvOXTlFDRVHYpd6iQqLubjToSMPeIEreSBQYjU8giiVxEZ+7mcFpBShFcXSTJWInBQJBANw5/euICWKnqtmN/PXzdKVC+Y4A2TsYgxWCQaCrjO7YytqCCoaZSJn0+rnTchI0VB2YP0nBxlz+8Jp7DkPjpMsCQQDUKR2Olmh7VB9OQ49KhsgGoNMZvZB69borAPtY8I3eSkyS3t6xTa5S9AEXV4hW1553/KewBAYvnAwS0Gkevbc7AkAzlaXjoLbKFAoR8Y9aMQ+WkkyQNaSskf5KcHtc3jIh1EgXzLQYeRknbtm3405p8zXsxLe2WBxVtiW3mbFqt4znAkEAoeLJmd5s1QYoaRimAtD7WgtnaPG7iAduSZgTMhdDuUVqTnte412J0eQ73Oq+rr0SPy37ahR3/+YLVGPQglNytwJAAcbSZ0EhcRaJUMcrrs2HQoMmQ53Gs5qJsVE5VWUh25Ryqjjo6y7kVYVVaYU1xhguMs7309Y4F4VFiPLZeLIpcw==';
+
+    const MER_NO = '49118';
+    const SUB_APPID = 'wx7d6509053659d9ed';
+    const COMPANY_NO = 'sweep-f4fea613fec043f8bd81e9b70375e364';
+
+    private function _reaEncode($str) {
+        $prikey = phpcommon\ReadPriKey(self::PRI_KEY);
+        return openssl_sign($str, $sign, $prikey, OPENSSL_ALGO_SHA1) ? base64_encode($sign) : false;
+    }
+
+    private function merchantIn()
+    {
+        $orderid = uniqid();
+        if (empty($orderid)) {
+            die();
+        }
+        $params = array(
+            'MerNo' => self::MER_NO,
+            'SignInfo' => '',
+            'PayType' => 'WXZF_ONLINE',
+            'RandomStr' => $orderid,
+            'ChannelNo' => '235009412',
+            'MerchantInfo' => array(
+                'MerName' => '上海画石网络科技有限公司',
+                'ShortName' => '画石网络',
+                'ServicePhone' => '17891958491',
+                'Business' => '203',
+                'SubAppID' => 'wx7d6509053659d9ed'
+            )
+        );
+        $params['SignInfo'] = $this->_reaEncode(
+            'MerNo=' . $params['MerNo'] . '&' .
+            'PayType=' . $params['PayType'] . '&' .
+            'RandomStr=' . $params['RandomStr'] .
+            ''
+        );
+        $xml_txt = phpcommon\objectToXml($params, '<ScanMerchantInRequest/>');
+        $xml_txt = str_replace('<?xml version="1.0"?>', '<?xml version="1.0" encoding="utf-8"?>', $xml_txt);
+        echo $xml_txt;
+        $requestDomain = base64_encode($xml_txt);
+        $response = '';
+        if (phpcommon\HttpClient::post('https://gwapi.yemadai.com/scanpay/merchantIn',
+                                       'requestDomain='. urlencode($requestDomain),
+                                       $response)
+        ) {
+            /*            echo json_encode(array(
+                'errcode' => 101,
+                'errmsg' => '交易失败:' . $response,
+            ));
+            die();*/
+        }
+        echo $response;
+        var_dump(base64_decode($response));
+    }
+
+    private function merchantInQuery()
+    {
+        $orderid = uniqid();
+        if (empty($orderid)) {
+            die();
+        }
+        $params = array(
+            'MerNo' => self::MER_NO,
+            'CompanyNo' => 'sweep-f4fea613fec043f8bd81e9b70375e364',
+            'SignInfo' => '',
+            'PayType' => 'WXZF_ONLINE',
+            'RandomStr' => $orderid,
+        );
+        $params['SignInfo'] = $this->_reaEncode(
+            'MerNo=' . $params['MerNo'] . '&' .
+            'CompanyNo=' . $params['CompanyNo'] . '&' .
+            'PayType=' . $params['PayType'] . '&' .
+            'RandomStr=' . $params['RandomStr'] .
+            ''
+        );
+        $xml_txt = phpcommon\objectToXml($params, '<ScanMerchantQueryInRequest/>');
+        $xml_txt = str_replace('<?xml version="1.0"?>', '<?xml version="1.0" encoding="utf-8"?>', $xml_txt);
+        $requestDomain = base64_encode($xml_txt);
+        $response = '';
+        if (phpcommon\HttpClient::post('https://gwapi.yemadai.com/scanpay/merchantInQuery',
+                                       'requestDomain='. urlencode($requestDomain),
+                                       $response)
+        ) {
+            /*            echo json_encode(array(
+                'errcode' => 101,
+                'errmsg' => '交易失败:' . $response,
+            ));
+            die();*/
+        }
+        var_dump(base64_decode($response));
+    }
+
+}
diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php
index 437d89b..f1fd113 100644
--- a/webapp/controller/PayController.class.php
+++ b/webapp/controller/PayController.class.php
@@ -104,9 +104,9 @@ class PayController {
 #        echo $xml_txt;
         $requestDomain = base64_encode($xml_txt);
         $response = '';
-        if (phpcommon\HttpClient::post(self::SCAN_PAY_API_URL,
-                                       'requestDomain='. urlencode($requestDomain),
-                                       $response)
+        if (!phpcommon\HttpClient::post(self::SCAN_PAY_API_URL,
+                                        'requestDomain='. urlencode($requestDomain),
+                                        $response)
         ) {
             echo json_encode(array(
                 'errcode' => 101,
@@ -133,86 +133,4 @@ class PayController {
         }
     }
 
-    private function merchantIn()
-    {
-        $orderid = $this->getOrderId();
-        if (empty($orderid)) {
-            die();
-        }
-        $params = array(
-            'MerNo' => self::MER_NO,
-            'SignInfo' => '',
-            'PayType' => 'WXZF_ONLINE',
-            'RandomStr' => $orderid,
-            'ChannelNo' => '235009412',
-            'MerchantInfo' => array(
-                'MerName' => '上海画石网络科技有限公司',
-                'ShortName' => '画石网络',
-                'ServicePhone' => '17891958491',
-                'Business' => '203',
-                'SubAppID' => 'wx7d6509053659d9ed'
-            )
-        );
-        $params['SignInfo'] = $this->_reaEncode(
-            'MerNo=' . $params['MerNo'] . '&' .
-            'PayType=' . $params['PayType'] . '&' .
-            'RandomStr=' . $params['RandomStr'] .
-            ''
-        );
-        $xml_txt = phpcommon\objectToXml($params, '<ScanMerchantInRequest/>');
-        $xml_txt = str_replace('<?xml version="1.0"?>', '<?xml version="1.0" encoding="utf-8"?>', $xml_txt);
-        echo $xml_txt;
-        $requestDomain = base64_encode($xml_txt);
-        $response = '';
-        if (phpcommon\HttpClient::post('https://gwapi.yemadai.com/scanpay/merchantIn',
-                                       'requestDomain='. urlencode($requestDomain),
-                                       $response)
-        ) {
-            /*            echo json_encode(array(
-                'errcode' => 101,
-                'errmsg' => '交易失败:' . $response,
-            ));
-            die();*/
-        }
-        echo $response;
-        var_dump(base64_decode($response));
-    }
-
-    private function merchantInQuery()
-    {
-        $orderid = $this->getOrderId();
-        if (empty($orderid)) {
-            die();
-        }
-        $params = array(
-            'MerNo' => self::MER_NO,
-            'CompanyNo' => 'sweep-f4fea613fec043f8bd81e9b70375e364',
-            'SignInfo' => '',
-            'PayType' => 'WXZF_ONLINE',
-            'RandomStr' => $orderid,
-        );
-        $params['SignInfo'] = $this->_reaEncode(
-            'MerNo=' . $params['MerNo'] . '&' .
-            'CompanyNo=' . $params['CompanyNo'] . '&' .
-            'PayType=' . $params['PayType'] . '&' .
-            'RandomStr=' . $params['RandomStr'] .
-            ''
-        );
-        $xml_txt = phpcommon\objectToXml($params, '<ScanMerchantQueryInRequest/>');
-        $xml_txt = str_replace('<?xml version="1.0"?>', '<?xml version="1.0" encoding="utf-8"?>', $xml_txt);
-        $requestDomain = base64_encode($xml_txt);
-        $response = '';
-        if (phpcommon\HttpClient::post('https://gwapi.yemadai.com/scanpay/merchantInQuery',
-                                       'requestDomain='. urlencode($requestDomain),
-                                       $response)
-        ) {
-            /*            echo json_encode(array(
-                'errcode' => 101,
-                'errmsg' => '交易失败:' . $response,
-            ));
-            die();*/
-        }
-        var_dump(base64_decode($response));
-    }
-
 }