Change to use pywe-response

Brightcells 8 gadi atpakaļ
vecāks
revīzija
d4c2c2a8d7
3 mainītis faili ar 5 papildinājumiem un 7 dzēšanām
  1. 0 4
      pai2/settings.py
  2. 4 3
      pay/views.py
  3. 1 0
      requirements.txt

+ 0 - 4
pai2/settings.py

@@ -241,10 +241,6 @@ WECHAT_BASE_REDIRECT_URI = 'https://api.pai.ai/base_redirect'
241 241
 WECHAT_USERINFO_REDIRECT_URI = 'https://api.pai.ai/userinfo_redirect'
242 242
 WECHAT_OAUTH2_RETRY_REDIRECT_URI = 'http://api.pai.ai/wx_oauth2?redirect_url={}'
243 243
 
244
-# 微信支付设置
245
-WXPAY_NOTIFY_SUCCESS = '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>'
246
-WXPAY_NOTIFY_FAIL = '<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[XML PARSE FAIL]]></return_msg></xml>'
247
-
248 244
 # 图片设置
249 245
 FILE_UPLOAD_MAX_MEMORY_SIZE = 5242880  # InMemoryUploadedFile 文件最大值
250 246
 FILE_UPLOAD_PERMISSIONS = 0o644  # TemporaryUploadedFile 文件权限设置

+ 4 - 3
pay/views.py

@@ -6,6 +6,7 @@ from django.db import transaction
6 6
 from django.shortcuts import HttpResponse
7 7
 from logit import logit
8 8
 from paginator import pagination
9
+from pywe_response import WXPAY_NOTIFY_FAIL, WXPAY_NOTIFY_SUCCESS
9 10
 from TimeConvert import TimeConvert as tc
10 11
 from wechatpy import WeChatPay, WeChatPayException
11 12
 
@@ -255,7 +256,7 @@ def wx_notify_url_api(request):
255 256
         data = xmltodict.parse(request.body)['xml']
256 257
     except xmltodict.ParsingInterrupted:
257 258
         # 解析 XML 失败
258
-        return HttpResponse(settings.WXPAY_NOTIFY_FAIL)
259
+        return HttpResponse(WXPAY_NOTIFY_FAIL)
259 260
 
260 261
     trade_type = data.get('trade_type', '')
261 262
 
@@ -273,7 +274,7 @@ def wx_notify_url_api(request):
273 274
     result_code = data.get('result_code', '')
274 275
 
275 276
     if return_code != 'SUCCESS' or result_code != 'SUCCESS':
276
-        return HttpResponse(settings.WXPAY_NOTIFY_FAIL)
277
+        return HttpResponse(WXPAY_NOTIFY_FAIL)
277 278
 
278 279
     try:
279 280
         order = OrderInfo.objects.get(order_id=out_trade_no)
@@ -282,7 +283,7 @@ def wx_notify_url_api(request):
282 283
 
283 284
     order_paid_success(order)
284 285
 
285
-    return HttpResponse(settings.WXPAY_NOTIFY_SUCCESS)
286
+    return HttpResponse(WXPAY_NOTIFY_SUCCESS)
286 287
 
287 288
 
288 289
 @logit

+ 1 - 0
requirements.txt

@@ -29,6 +29,7 @@ mock==2.0.0
29 29
 pep8==1.7.0
30 30
 pywe-miniapp==1.0.0
31 31
 pywe-oauth==1.0.2
32
+pywe-response==1.0.0
32 33
 records==0.4.3
33 34
 redis-extensions==1.0.38
34 35
 requests==2.12.4