From bd821faf9dca2641aaa0f4a05d60e19b92558c51 Mon Sep 17 00:00:00 2001 From: XingQue Date: Sat, 20 Jun 2026 21:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=8F=90=E7=8E=B0=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- yonghu/tixian_shenhe_services.py | 10 ---------- yonghu/views.py | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/yonghu/tixian_shenhe_services.py b/yonghu/tixian_shenhe_services.py index e2bcbcd..e1207b1 100644 --- a/yonghu/tixian_shenhe_services.py +++ b/yonghu/tixian_shenhe_services.py @@ -295,11 +295,6 @@ def validate_withdraw_eligibility(user_main, leixing, jine): return False, '商家账号已被禁用，无法提现', {} if shangjia.yue < jine: return False, f'商家余额不足，当前余额: {shangjia.yue}', {} - unfinished_orders = DingdanShangjia.objects.filter( - shangjia_id=yonghuid, - ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists() - if unfinished_orders: - return False, '您还有未完成或未退款的订单，请先处理完毕再提现余额', {} return True, '', {'nicheng': shangjia.nicheng or ''} return False, '无效的提现类型', {} @@ -382,11 +377,6 @@ def validate_collect_eligibility(user_main, leixing): return False, '您不是商家身份，无法收款' if shangjia.zhuangtai != 1: return False, '商家账号已被禁用，无法收款' - unfinished_orders = DingdanShangjia.objects.filter( - shangjia_id=yonghuid, - ).exclude(dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED]).exists() - if unfinished_orders: - return False, '您还有未完成或未退款的订单，无法收款' return True, '' return False, '无效的提现类型' diff --git a/yonghu/views.py b/yonghu/views.py index fbebc10..e0efca1 100644 --- a/yonghu/views.py +++ b/yonghu/views.py @@ -2153,9 +2153,7 @@ class TixianShenqingView(APIView): from django.db.models import Q def _check_shangjia_withdraw(self, user_main, jine): - """ - 商家余额提现校验：仅校验订单状态，允许已完成(3)与已退款(5)，其余状态不可提现。 - """ + """商家余额提现校验：身份、账号状态、余额。""" try: shangjia = UserShangjia.objects.get(user=user_main) except ObjectDoesNotExist: @@ -2166,14 +2164,6 @@ class TixianShenqingView(APIView): if shangjia.yue < jine: return {'code': 62, 'msg': f'商家余额不足，当前余额: {shangjia.yue}'} - unfinished_orders = DingdanShangjia.objects.filter( - shangjia_id=user_main.yonghuid, - ).exclude( - dingdan__zhuangtai__in=[ORDER_STATUS_COMPLETED, ORDER_STATUS_REFUNDED] - ).exists() - if unfinished_orders: - return {'code': 63, 'msg': '您还有未完成或未退款的订单，请先处理完毕再提现余额'} - return {'code': 0, 'msg': 'ok', 'data': {'nicheng': shangjia.nicheng or ''}} def _check_dashou_yajin_withdraw(self, user_main, jine):