wushaodong 4 anni fa
parent
commit
9e319c2ac8

+ 0 - 1
apps/tenant/models.py

@@ -235,7 +235,6 @@ class Pay(models.Model):
         qrcode = ''
         if pay_channel == Pay.WECHAT:
             qrcode = WeChatResponse().unifiedOrder(pay.pay_no, round(float(Formater.formatAmountShow(amount)), 2))
-            pass
         elif pay_channel == Pay.ALIPAY:
             qrcode = Alipay.payUnifiedOrder(pay.pay_no, round(float(Formater.formatAmountShow(amount)), 2))
 

+ 3 - 3
ly_baoxiu_admin/settings.py

@@ -285,9 +285,9 @@ WEAPP = {
 #支付宝支付
 ALIPAY_SETTING = {
     'notify_url':'https://baoxiu.zzliaoyuan.com/api/alipay_notify/',
-    'app_id': '2021002110695436',
-    'app_private_key': 'MIIEowIBAAKCAQEAp9Yuf4HzpWACOnO3QQ+Z1ne4wanzGdNcpEIkpNxhI0VmulystLm6TYQ8S1lARMoWSRtMdwxx4DuOUekKt6v5zIP7edk4euUYqqCfuDgqvVkmbxYBL+IF2hsR70Z6f9DEOlKc6jWz+arO1F4SLiw9WZhqIpx9XduWq7I5vuzuXA32jp0uqYFv/k8qsF0a2wRRNKU1EFqIWECGVsYQ8WIC/841hGuEWYDvAEzUsFmc1b4rsX4PoJxtajy4xvz9Cn4EXu4Ce9n+LKH+nCYazEsfliAUUxbvebiMykRzICpzn1n21yWWbJ705BVJZk9yiJsiLsDOuSRC4EV2XbQVBkn/oQIDAQABAoIBAH9sIMk1hCFeDtMJ32tJyOYG5wJBYQuOaJtcjC2OE0GQAzoh+g0LpOINLymVjTGsq9a9HwSTMjGnhZmycCyaKICZA2ey/ypunJeOczSNkAVJleBouGX+F6tLOgaLX52ChjgxWGiIdSdsArNA6FSdycYn7Qxx+swzVuTr3uORRjYkNccaJX47dqawN79ROtJrRIsc35rmzkWywt0Zv41Lun3rbqLlaE881xZ4awuUsm4rrAWAktwyU7bQ6P0kUrII+207penco/hmFN8xTLlO0an6ZdK2YhUM/xZvEaitbDZ6JMqIu7mbkZBLGFUoH4H2IaCMpUETdVE9ajpo4rt7xUECgYEA7wL1sQwpVgLXkoVx6CitN9g4hVdSi9Mpcjk8m4j1YpPxO2/p1Dtvg9oNU9SV3VN9lACOu4V5uH8cfnsGO8K1mVeyEykYUpCMZW2zKUlD+rDE5kSiGxAEuNL9JIUxXf1V8u0DGVBiPrYSbSZkGF181bTgYhAtXsrvOpA4Y051M5UCgYEAs8Qgmnytlotpm5YeAAeIT+2XdYsFgr4syb0IOxE6jjhCFe8cmdiaaRhMDLPXBYd9UGpCND5Xs6g8fFQrMd0jAXByMHPbeAJbyqu7Q3MfICiHx1q59I/8nsn9kR9kaCkySKuagI5G5zk+pK5kjAYrBQHMeQUes6dsXD0DWsOMmN0CgYEA2p0ybQZaqLlgxDwau+a4yWOUDyKX9hzmw/tmXD0hdVEsTNlIXz8d+NPxbMP9b7t2GXGJHCwx8XcScP3F7dNilyeHUc882Agu4nc8cH77Fsmoz5XnUCmOqB8UO9s4FGgrvU7cjsLfmcyffgand0HLdQ1ET23Mke+8cSyI5wxUVyECgYByizL3HSCCv3xgXgvpmuMZgtuyUw4E2+av+RoogPbdri01yrFfuivRcWDr6x/EbyvDNKHQpjS9ziIUWpFXaX+nqB2qj/g1BNO2VSyycsVPeWPi/AVnNuQRzcUbVnRlBnL66RU+eunk5Y3r4w9ARaHdw+Kk7kU81h5uu5XKnLWWpQKBgAHh2f+5NmawVHO67fyyh3EOKi0ulU6EHaz9n9+4sPQNpsSZCyZVU9EulLrfG5XxAZ5fvXlSsLku1v8PJkMKnH/hmHLD+0vKIG3q4gH5xSwwwqnS5P+uS+CrPrYu6GbGQv/6HYOBaWtEkN1M23p5RL7ip0hC61YnlnbsSkBR8yNa',
-    'alipay_public_key':'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArZ99sw89lpJALHy3gc0B+B59aaEBgqALT+B8TtTWm1yi07b/pmg9cFjcxv7dw4BK9bQPidx19V5X2eLt0EylZMhtA0gihbnOXVhtcTlMfF9F2EhSXMfoHlKsqL0fQlkyZrmVCvx6nTwdbbhOLobOnVcbG2L8hVlSNkR4KkvSxat15sO09IC1IIj27nUDfIto6mVVeM4a0/49ePcFnVzhJaoHSmr6IHCldk4ZHAu3CDp2g3ZXzC9SEWB5kQJOxejm2iafgrocguyQkGLhYL5uatEQGQdgri+9ZqepvWSDBdOqgLwJBlv/NxmcIHEq33FbSGzzOuLRgVER77bwdoDyDQIDAQAB',
+    'app_id': '2016101202110194',
+    'app_private_key': 'MIIEpAIBAAKCAQEArkjhoebB4tmy7oXxQZ8RyUH3CSqJnJSFsfZ/Ntjga+R7UGZ5NEBm92UeK2O6dYM/iSWBzIDjL2i5uqk3GdjJ+EUv1fN1oz0FjygDvaNDjo7FkgN+tRI4iSFkL/kRE+Rf0NQo1mZntqVm26ySMmsk0qr8JH4HE/3R6FiDiBvMezvYEWP/4QpmFbxQjeY3JXixJX+9Yf3mZMOW8OPNwA9zkD/5tSNvRQTdgl4aMVB6eGcJ2zhx+usJjdkITAuppzHKMdRgMpaLTTcyN8e62VRM8FUgmvhb6cyc1lob+cOswHR3Bkjw0CbM+WRbWBIq3kdhpkOB1QVanaWpFBTHVL3CNwIDAQABAoIBAGynr1OaY6IkCvO9ua0pmJMadwLV7DkcN0W94Y22JCPfrClx2XqD9C2kcuymHicJDmFYatWuPPTfm3sN5/ZLO492wt3mDJ8aeg7H6Z0e3g1QYUgouaP1mh2UHbvy0XzPUhUFT/hqm5o5AClQK00XkztrsgqmL499HJJ4LHh8rDzfCHAejxzZvczJJjW1Rozxot471FGqH61fRnkY1p2sTjfBw3TJpEtXUg/EAptDpa0Tu9HzC2LiyH7gM/kc7X35j2wbtyTIQ6ut0T0SW/BRsqPY5w3nFgMft/sDIMWWAbcMb1mX9JQvhxJajU+ZoYlRzUVPmheiqvYfY3NdATlBhuECgYEA4NN5+/9uM8H1y3GcARu4jt0YhhEHM9jxINxvN71WBzvGGikqD4sYY1ROfiz5TTj9dP4jaZtKwsbOpbCm43JMDOktEkbB6Gc6zWSvtvDsrVpzdGylF8vx1ziT0U1CFpXdkiXM3u4u8pknrJvSpdi+nGL9Lw/ajRR0BjBcbz1hdx8CgYEAxnNdsg5kLZMaLAu9SJU4v3mfE6Shujsgsc0h0bTDDD2E3jcLEuD1+ssdN0uxDqRXqzVvLIBeep8JXWX3rHyoM9GMwWSlzesaExP1NbPdHCYEsRAmNFNzxWLbwk4HT7wAJ1ecUvgI80N+KQOOrBAaKpuzsw1eA6DQIjbjCMRfyekCgYBbdSvWW15VJ735eMnhmYlGdKKZRywK52GP4JxNrHPmlWZNFhnKIOdW4ODdayYvR9OzV/7H4yhSe9VsiaQaOlC9n8159dbD19qP2zmvzeo5yuXUoq22NHy49IcNScRss6Ji5YWl2na2sZ72FJ1oYfeIXqxoDKb3ZS6dpea0Sd/wOQKBgQC71MnkE/cBo+/rrJjVsFdr8+N7JiHlML27TFssL5lFZpzx7stObRqk68aVZdEJ+Mb5x7OYPVAvY4ProO2RltNlaHt/OJIums2tLQC0ea9YSyu5o31lnW9AblduS4hkEZ9bnXLanOVryoAItdM+TGdX2NN3L7nCWV1mZOjyjVvUsQKBgQDLRNdf/BLhVYUOJe/cJ66JXMS2gBkMf0EnUdCMkZ+cidAonl4Dtrv8+b8haeuqL55SuPWUtvVD2VmLVOaZIE0yxGeVEW2jVi0FwiZoNFjntuJHuwoerFSW4AobajIy4xeg3LWSqxD2nKWxTCAXumwGozCdnCgCWQSp3+L+8Xu6oA==',
+    'alipay_public_key': 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlfOIgQCOmHu1qMdmrOlS3+mMmNab9ZWTmm6R0QP91+E9ShNQbBRizE/muY9QYowp4smCeZBxuVCq5KRDJqcCq/o0DKc2tW/wpBFZaWzIngJsxuwTdRX6zsmM1u/c6sgcPY4rNYc6Gs2Ago8imKceHIcCQqhXb8+m3JOlgTd/EnRFlufPyu8WwUWQqRGfLM95g03bC7yH/Bh7GU7yrx0pvBp9ywW13SyiM9Kgw8h291AzZLJHFGD0mkvKKAiU951WprbjmFG5gE90vhHdQJtUEBm1m5Hn7SWR2iMlUbS2y8GioFkOUOra3wt+BJZ8yw/Z3XeJj9LacYgCO1B/EIeSlwIDAQAB',
 }
 # 微信登录、支付
 WECHAT = {

+ 1 - 1
uis/tenant/company/pay_order.html

@@ -222,7 +222,7 @@
         function getQrcode(pay_edition){
            admin.req({
                 url: '/tenant/company/' + company_id + '/get_code/',
-                data: {company_id: company_id, pay_channel, pay_edition},
+                data: {pay_channel, pay_edition},
                 done: function (res) {
                     $('#pay-code').empty()
                     $('#pay-code').qrcode({width: 150, height: 150, text: res.data.qrcode});