在线续费 支付宝

apps/Alipay.py

@@ -34,7 +34,7 @@ class Alipay():
         model = AlipayTradePrecreateModel()
         model.out_trade_no = payment_no
         model.total_amount = amount
-        model.subject = '爱车无忧保障服务'
+        model.subject = settings.PAY_SUBJECT
 
         request = AlipayTradePrecreateRequest(biz_model=model)
         request.notify_url = notify_url

apps/WeChatResponse.py

@@ -19,7 +19,7 @@ WEIXIN_SIGN_TYPE = 'MD5'
 # 服务器IP地址
 WEIXIN_SPBILL_CREATE_IP = settings.WECHAT['spbill_create_ip']
 # 微信支付用途
-WEIXIN_BODY = u'燎原云报修'
+WEIXIN_BODY = settings.PAY_SUBJECT
 # 微信KEY值 【API密钥】
 WEIXIN_KEY = settings.WECHAT['merchant_key']
 # 微信统一下单URL

apps/tenant/views.py

@@ -1,5 +1,7 @@
 # coding=utf-8
 import traceback
+import datetime
+import time
 from django.db import transaction
 from rest_framework.decorators import action
 from rest_framework_jwt.views import ObtainJSONWebToken,VerifyJSONWebToken,RefreshJSONWebToken
@@ -77,8 +79,22 @@ class CompanyViewSet(CustomModelViewSet):
         else:
             raise CustomError('续费金额错误')
 
-        result = []
         try:
+            tenant = Tenant.objects.filter(id=pk).first()
+            if tenant:
+                today = datetime.datetime.now().strftime('%Y-%m-%d')
+                today_stamp = time.mktime(time.strptime(today,"%Y-%m-%d"))
+
+                end_date = time.mktime(time.strptime(tenant.end_date.strftime('%Y-%m-%d'), '%Y-%m-%d'))
+                diff = int(end_date) - int(today_stamp)
+                if diff >= 0:
+                    start_date = tenant.end_date
+                    renew_date = (tenant.end_date + datetime.timedelta(days=365*int(year))).strftime('%Y-%m-%d')
+                else:
+                    start_date  = today
+                    renew_date = (datetime.datetime.now() + datetime.timedelta(days=365 * int(year))).strftime('%Y-%m-%d')
+            else:
+                raise CustomError('获取企业信息失败，请刷新重试！')
             with transaction.atomic():
                 if int(pay_channel) == Pay.WECHAT:
                     line_data = Pay.wechatPay(request.user, pk ,amount)
@@ -87,6 +103,7 @@ class CompanyViewSet(CustomModelViewSet):
                 else:
                     raise CustomError('请选择正确的支付方式')
                 data = {
+                    'renew_date': '{} — {}'.format(start_date,renew_date),
                     'year': year,
                     'amount': Formater.formatAmountShow(amount),
                     'id': line_data.id,

ly_baoxiu_admin/settings.py

@@ -274,13 +274,18 @@ WEAPP = {
     'message_template': 'V-b3rOtf47SbxsIoN1o2IdAL7cNjfrCnrlD6m-XEeYs',
 }
 #支付宝支付
+ALIPAY_SETTING11 = {
+    'notify_url':'http://www.tzxkj168.com/api/alipay_notify/',
+    'app_id': '2016101202110194',
+    'app_private_key': 'MIIEpQIBAAKCAQEA5X4g9CGSOBOcaA76mibpXq5Cp4jfVLrvdQiQTk9ENPuE7af81Roh4ogXW7EK4Iu6QNPKjmX9AXD4Kj0wlNEzcokdNTlXvAHTkIUKlwLUv+0oFBuBkQPWydP5i2yAw590exGVrMHH4ctSkCgll18DdEOSDhREy6lCoQAOxK5bc+obiQ5+AjgbjwFMoax3NXh9qdpzOjmCX3oiI+Mzhu1tGHoJy/opRA71BZ+ehTHic/0hK/wCasIueRfHShWrPZuIqThSTxFgVEVIUpdmU0q1P6RRDpaqteBLg86asc9YglDZ2F7jnIttwDWma26NhcM8V6v04dCOWjThKt/SCSSlRwIDAQABAoIBAQChwVoW2UbHscLvcYdfegfJjYg7r/TCMxSu5/9WwvYvZg0Wue4ygj3Z/tR/83TYOoRoRx+haO+AwZCZrRF+A0qA83Yb2rQlNyBY3/1L3Vn5gX5bVdvoS81r6rYceLj1qYGfcRCPePKbCwXByBpe7EByBWJ/+/dVmZL2CiVeqgqZ0tYTDBv2t9SLUShI0tARrSN6TZD3pZYI8fx3uv6438BIeZfZSE73lNBRDxZFbnnhFwoheGMrRA6FCMmJekfWQFEQyojLxxwmL7ZLRcOwdJP+qqOufk3NyAA2BBUTUuh13kdildn+HgIjzla5O4u2uPXqtQwDxQWd4hElQxpljtrpAoGBAPihtjcTfidb3oOYZiH6g4xwnKJMWja/g1tutu0FoCyEOv4QI+uWtopSPayOX+pGAtCEqwHYQWqDsxGD9j6TRhvPJ+WGo+dIihNC7GnPf5LYf9kC24vKkNlFXEVaud3O/0vz+LpcCTvr9RPgjX5ZfwIczAEq/EfN6jlUiy0pHt0FAoGBAOxLNy+aEBubm+9TZeJJh/EqbXQPsRlvEpg2UgIVr21j4dmww16At5brtuVooaLhTLNgFSl+/ngxoJfmuLro0B30rzcyKGMZFpMydcXMOyVmVdn4u7CgyHdZFdC2kQcL4tuO24aSxJjYHMHfjacqVYxQWaIIPCQVQ1cOQ6pUi+rbAoGBALsW3Il3Jo+xZq/5Zqkc3A460vKhp6TY2ZxcpFOYzx2QZt+0/4KQh01wcy48eFpOUmHb4t5hf2AKOB3vAcW2hqP4btodRYqNIDE8Q6+fTy0Nsq52owP+6p5DvhoGGiSZVawuqrR4+w3XETTi3TX9XEAXsT8TvIC/pwd64bua3LmNAoGBAN1ukvWp02R7y4JYTgbjz2AB2XZE6jqiavN3HBzWA4JocpKU4lCiIOluVQPgrHA936nM5afwWTl7kDopPX3yhG0+CiCYgV50eUJRrCpC/D5NCzDrtb+MvK+TLS1cmMXYrqv/0NromRF+nFxWSaGYu3h1J7n/K5TI1EU1mdV5y3C3AoGAIsahkI0EHJq/vzYPa1JRMPAQlfQIHBbw4koc6EYx4JMdhVJS4P2d/JqVY0CZ3ODDDPPjmUa7EXwGVPsxn5noA3zcnx5V2uyM5i+EEDeJzTQIkFXPjg9yLJZ35Gc7wzI6nutFJ1HodmWwNSOaGi5/tSQqT1ORaJCDGvbLZ14hyJs=',
+    'alipay_public_key':'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5X4g9CGSOBOcaA76mibpXq5Cp4jfVLrvdQiQTk9ENPuE7af81Roh4ogXW7EK4Iu6QNPKjmX9AXD4Kj0wlNEzcokdNTlXvAHTkIUKlwLUv+0oFBuBkQPWydP5i2yAw590exGVrMHH4ctSkCgll18DdEOSDhREy6lCoQAOxK5bc+obiQ5+AjgbjwFMoax3NXh9qdpzOjmCX3oiI+Mzhu1tGHoJy/opRA71BZ+ehTHic/0hK/wCasIueRfHShWrPZuIqThSTxFgVEVIUpdmU0q1P6RRDpaqteBLg86asc9YglDZ2F7jnIttwDWma26NhcM8V6v04dCOWjThKt/SCSSlRwIDAQAB',
+}
 ALIPAY_SETTING = {
     'notify_url':'http://www.tzxkj168.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',
 }
-
 # 微信登录、支付
 WECHAT = {
     'appid': 'wxab1e10bcf7650601',  # 微信 服务号
@@ -289,6 +294,7 @@ WECHAT = {
     'merchant_key': '4fmqm5axuBcI1jYK3uGvfaOLdk8coB6A',                  # 商户平台API密钥
     'spbill_create_ip':'123.56.60.154',
 }
+PAY_SUBJECT = u'燎原云报修'
 # 导入本地设置
 try:
     from ly_baoxiu_admin.local_settings import *

uis/tenant/company/pay_order.html

@@ -17,9 +17,11 @@
         <div class="layui-card-body">
             <div align="center">
                 <br>
-                <H2 style="color:rgb(0,0,0);">续费时间：<span id="id_year" style="color:red"></span></H2>
+                <H2 style="color:rgb(0,0,0);">续费年限：<span id="id_year" style="color:red"></span></H2>
                 <br>
-                <H2 style="color:rgb(0,0,0);">合计支付金额：<span id="id_amount" style="color:red"></span></H2>
+                <H2 style="color:rgb(0,0,0);">续费时间：<span id="id_renew_date" style="color:red"></span></H2>
+                <br>
+                <H2 style="color:rgb(0,0,0);">支付金额：<span id="id_amount" style="color:red"></span></H2>
                 <br>
                 <H2 style="color:rgb(0,0,0);">支付方式：<span id="id_pay_channel" style="color:red"></span></H2>
                 <br>
@@ -63,6 +65,7 @@
                     $('#id_pay_channel').html('支付宝')
                 }
                 $('#id_year').html(res.data.year+'年')
+                $('#id_renew_date').html(res.data.renew_date)
                 $('#id_amount').html(res.data.amount)
                 pay_id = res.data.id
                 $('#pay-code').qrcode({width: 200, height: 200, text: res.data.qrcode});