商家提现取消订单状态校验

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-06-20 21:50:48 +08:00
parent 5e4be15990
commit bd821faf9d
2 changed files with 1 additions and 21 deletions

View File

@@ -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, '无效的提现类型'

View File

@@ -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):