|
@@ -85,7 +85,7 @@ class CloudStorageView(View):
|
|
|
elif operation == 'doalicallback':
|
|
|
return self.do_pay_by_ali_callback(request)
|
|
|
elif operation == 'dowechatnotify':
|
|
|
- return self.do_pay_by_wechat_callback(request_dict,response)
|
|
|
+ return self.do_pay_by_wechat_callback(request, request_dict, response)
|
|
|
elif operation == 'getsignsts':
|
|
|
ip = CommonService.get_ip_address(request)
|
|
|
return self.do_get_sign_sts(request_dict, ip, response)
|
|
@@ -954,27 +954,21 @@ class CloudStorageView(View):
|
|
|
red_url = "{SERVER_DOMAIN}cloudstorage/payOK".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
return HttpResponseRedirect(red_url)
|
|
|
|
|
|
- def do_pay_by_wechat_callback(self, request_dict, response):
|
|
|
+ def do_pay_by_wechat_callback(self, request, request_dict, response):
|
|
|
result_code = request_dict.get('result_code', None)
|
|
|
+ result_codetwo = request.POST.dict()
|
|
|
logger = logging.getLogger('log')
|
|
|
- logger.info(result_code)
|
|
|
+ logger.info(result_code+":one")
|
|
|
+ logger.info(result_codetwo + ":two")
|
|
|
try:
|
|
|
if result_code == 'SUCCESS':
|
|
|
check_sign = WechatPayObject.get_notifypay(request_dict)
|
|
|
if not check_sign:
|
|
|
return HttpResponse(WechatPayObject.xml_to_dict({'return_code': 'FAIL', 'return_msg': '签名失败'}))
|
|
|
orderID = request_dict.get('out_trade_no', None)
|
|
|
- asy = threading.Thread(target=ModelService.add_log,
|
|
|
- args=(orderID,
|
|
|
- '回调', '修改订单状态'))
|
|
|
- asy.start()
|
|
|
- self.callback_dostatus(orderID)
|
|
|
print("进来了,微信支付成功回调")
|
|
|
+ self.callback_dostatus(orderID)
|
|
|
|
|
|
- asy = threading.Thread(target=ModelService.add_log,
|
|
|
- args=(orderID,
|
|
|
- '回调', '进来了,微信支付成功回调'))
|
|
|
- asy.start()
|
|
|
order_qs = Order_Model.objects.filter(orderID=orderID)
|
|
|
nowTime = int(time.time())
|
|
|
order_list = order_qs.values("UID", "channel", "commodity_code", "rank", "isSelectDiscounts",
|