|
@@ -170,15 +170,24 @@ class AgentCustomerView(View):
|
|
|
}
|
|
|
|
|
|
if card_details:
|
|
|
+ # 获取银行卡号
|
|
|
+ card_no = card_details.card_no
|
|
|
+ # 检查银行卡号字符串长度,如果小于等于8,则返回"null"
|
|
|
+ if len(card_no) <= 8:
|
|
|
+ masked_card_no = "null"
|
|
|
+ else:
|
|
|
+ # 保留前四位和后四位,用"*"代替中间的数字
|
|
|
+ masked_card_no = card_no[:4] + '*' * (len(card_no) - 8) + card_no[-4:]
|
|
|
+
|
|
|
result['agent_info'].update({
|
|
|
'card_name': card_details.name,
|
|
|
- 'card_no': card_details.card_no,
|
|
|
+ 'card_no': masked_card_no,
|
|
|
'card_address': card_details.card_address,
|
|
|
})
|
|
|
|
|
|
return response.json(0, result)
|
|
|
except Exception as e:
|
|
|
- return response.json({'error': str(e)}, status=500)
|
|
|
+ return response.json(500, {'error': str(e)})
|
|
|
|
|
|
def get_agent_service_package(self, request_dict, response):
|
|
|
"""
|
|
@@ -232,7 +241,7 @@ class AgentCustomerView(View):
|
|
|
})
|
|
|
except Exception as e:
|
|
|
# 出错时返回错误信息
|
|
|
- return response.json({'error': str(e)}, status=500)
|
|
|
+ return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
def add_agent_service_package(self, userID, request_dict, response):
|
|
|
"""
|
|
@@ -281,7 +290,7 @@ class AgentCustomerView(View):
|
|
|
)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
- return response.json({'error': str(e)}, status=500)
|
|
|
+ return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
def update_agent_service_package(self, userID, request_dict, response):
|
|
|
"""
|
|
@@ -318,7 +327,7 @@ class AgentCustomerView(View):
|
|
|
except AgentCloudServicePackage.DoesNotExist:
|
|
|
return response.json(173)
|
|
|
except Exception as e:
|
|
|
- return response.json({'error': str(e)}, status=500)
|
|
|
+ return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
def del_agent_service_package(self, request_dict, response):
|
|
|
"""
|
|
@@ -594,8 +603,9 @@ class AgentCustomerView(View):
|
|
|
agent_customer_info = AgentCustomerInfo.objects.filter(id=order.ac_id).first()
|
|
|
company_name = agent_customer_info.company_name if agent_customer_info else order.ac_id
|
|
|
ado_id = order.id
|
|
|
- settled_profit = AgentDeviceOrderInstallment.objects.filter(ado_id=ado_id, status=2).aggregate(Sum('amount'))[
|
|
|
- 'amount__sum'] or 0
|
|
|
+ settled_profit = \
|
|
|
+ AgentDeviceOrderInstallment.objects.filter(ado_id=ado_id, status=2).aggregate(Sum('amount'))[
|
|
|
+ 'amount__sum'] or 0
|
|
|
orders.append({
|
|
|
'id': order.id,
|
|
|
'company_name': company_name,
|