diff --git a/config/views.py b/config/views.py index 1767f5f..bb52353 100644 --- a/config/views.py +++ b/config/views.py @@ -2242,6 +2242,7 @@ class KehuGetDingdanLianjieView(APIView): 'jieshao': dingdan_obj.Description or '', 'shangjia_mingcheng': shangjia_nicheng, 'zhuangtai': dingdan_obj.Status, + 'jiedan_dashou_id': dingdan_obj.PlayerID or '', # 新增配置字段 'kefu_link': kefu_link, 'oss_url': oss_url, @@ -2260,7 +2261,7 @@ class KehuGetDingdanLianjieView(APIView): pass dingdan_info.update({ 'youxi_nicheng': dingdan_obj.Nickname or '', - 'zhiding_dashou': dingdan_obj.AssignedID or dingdan_obj.PlayerID or '', + 'zhiding_dashou': dingdan_obj.AssignedID or '', 'beizhu': dingdan_obj.Remark or '', 'waibu_dingdan_id': dingdan_obj.ExternalOrderID or '', 'laoban_shouji': laoban_shouji, @@ -2437,7 +2438,7 @@ class KehuTianxieDingdanView(APIView): 'data': None }, status=status.HTTP_400_BAD_REQUEST) - ok_phone, msg_phone = validate_cn_mobile(laoban_shouji) + ok_phone, msg_phone = validate_cn_mobile(laoban_shouji, required=False) if not ok_phone: logger.warning(f"老板手机号校验失败 - IP: {client_ip}") return Response({ diff --git a/utils/pdd_order_validator.py b/utils/pdd_order_validator.py index 2966230..185d647 100644 --- a/utils/pdd_order_validator.py +++ b/utils/pdd_order_validator.py @@ -76,11 +76,13 @@ def validate_pdd_order_id(raw: str) -> tuple[bool, str]: return True, '' -def validate_cn_mobile(raw: str) -> tuple[bool, str]: - """中国大陆手机号校验。""" +def validate_cn_mobile(raw: str, required: bool = False) -> tuple[bool, str]: + """中国大陆手机号校验;默认选填,空值通过。""" phone = str(raw or '').strip() if not phone: - return False, '手机号不能为空' + if required: + return False, '手机号不能为空' + return True, '' if not re.match(r'^1[3-9]\d{9}$', phone): return False, '请输入正确的11位中国大陆手机号' return True, ''