trivial

apps/web/agent/views.py

@@ -1270,17 +1270,19 @@ def agentWithdraw(request):
 
     payload = json.loads(request.body)
 
-    open_id = payload.get('openId')
-    if not open_id:
-        return JsonResponse({"result": 0, "description": u'鉴权失败，请刷新后再试', 'payload': {}})
+    pay_type = payload.get('payType')
+    assert pay_type in (
+        WITHDRAW_PAY_TYPE.WECHAT, WITHDRAW_PAY_TYPE.BANK, WITHDRAW_PAY_TYPE.ALIPAY), 'not support this pay type'
+
+    if pay_type == WITHDRAW_PAY_TYPE.WECHAT:
+        open_id = payload.get('openId')
+        if not open_id:
+            return JsonResponse({"result": 0, "description": u'鉴权失败，请刷新后再试', 'payload': {}})
 
-    request.user.withdraw_open_id = open_id
+        request.user.withdraw_open_id = open_id
 
     amount = RMB(payload.get('amount', 0.0))
-    pay_type = payload.get('payType')
 
-    assert pay_type in (
-        WITHDRAW_PAY_TYPE.WECHAT, WITHDRAW_PAY_TYPE.BANK, WITHDRAW_PAY_TYPE.ALIPAY), 'not support this pay type'
     assert amount > RMB(0), 'amount must be bigger than zero'
 
     status, msg = request.user.withdraw_sms_provider.verify(phoneNumber = request.user.withdraw_sms_phone_number,
@@ -1697,7 +1699,7 @@ def withdrawEntry(request):
     if not is_ledger:
         return ErrorResponseRedirect(error = u'系统配置错误，请联系平台客服(10005)')
 
-    wechat_withdraw_gateway = withdraw_gateway_list['wechat']
+    wechat_withdraw_gateway = withdraw_gateway_list['wechat']  # type: WithdrawGateway
     if wechat_withdraw_gateway.support_withdraw and not wechat_withdraw_gateway.manual_withdraw:
         code = request.GET.get('code', None)
         if not code:

apps/web/dealer/views.py

@@ -3279,35 +3279,34 @@ def dealerWithdraw(request):
     :return:
     """
 
-    currentDealer = request.user  # type: cast(Dealer)
-
     payload = json.loads(request.body)
 
-    open_id = payload.get('openId')
-    if not open_id:
-        return JsonResponse({"result": 0, "description": u'鉴权失败，请刷新后再试', 'payload': {}})
-
-    request.user.withdraw_open_id = open_id
-
-    amount = RMB(payload.get('amount', 0.0))
     pay_type = payload.get('payType')
-
     assert pay_type in (
         WITHDRAW_PAY_TYPE.WECHAT, WITHDRAW_PAY_TYPE.BANK, WITHDRAW_PAY_TYPE.ALIPAY), 'not support this pay type'
+
+    if pay_type == WITHDRAW_PAY_TYPE.WECHAT:
+        open_id = payload.get('openId')
+        if not open_id:
+            return JsonResponse({"result": 0, "description": u'鉴权失败，请刷新后再试', 'payload': {}})
+
+        request.user.withdraw_open_id = open_id
+
+    amount = RMB(payload.get('amount', 0.0))
     assert amount > RMB(0), 'amount must be bigger than zero'
 
-    status, msg = request.user.withdraw_sms_provider.verify(phoneNumber=request.user.withdraw_sms_phone_number,
-                                                            smsCode=payload.get('code'))
+    status, msg = request.user.withdraw_sms_provider.verify(phoneNumber = request.user.withdraw_sms_phone_number,
+                                                            smsCode = payload.get('code'))
     if not status:
         return JsonResponse({"result": 0, "description": msg, 'payload': {}})
 
-    withdraw_service = DealerWithdrawService(payee=request.user,
-                                             income_type=payload.get('sourceType'),
-                                             amount=amount,
-                                             pay_type=pay_type,
-                                             bank_card_no=payload.get('bankAccount', ''))
+    withdraw_service = DealerWithdrawService(payee = request.user,
+                                             income_type = payload.get('sourceType'),
+                                             amount = amount,
+                                             pay_type = pay_type,
+                                             bank_card_no = payload.get('bankAccount', ''))
 
-    result = withdraw_service.execute(source_key=payload.get('sourceId'), recurrent=False)
+    result = withdraw_service.execute(source_key = payload.get('sourceId'), recurrent = False)
     logger.debug('withdraw result is: {}'.format(result))
 
     return JsonResponse(result)