diff --git a/gvsdsdk/models.py b/gvsdsdk/models.py index d79d374..60bf5f5 100644 --- a/gvsdsdk/models.py +++ b/gvsdsdk/models.py @@ -194,6 +194,7 @@ class User(QModel): Phone = models.CharField(max_length=11, db_column='Phone', verbose_name='手机号', null=True, blank=True) PhoneVerified = models.BooleanField(default=False, db_column='PhoneVerified', verbose_name='手机号是否已认证') IP = models.CharField(max_length=50, db_column='IP', verbose_name='来访用户IP', null=True, blank=True) + IsStaff = models.BooleanField(default=False, db_column='IsStaff', verbose_name='是否员工') IsSuperuser = models.BooleanField(default=False, db_column='IsSuperuser', verbose_name='是否超级用户') diff --git a/orders/views.py b/orders/views.py index 1829be8..aadd03b 100644 --- a/orders/views.py +++ b/orders/views.py @@ -1093,7 +1093,7 @@ class DingdanHuoquView(APIView): 'dingdanId': order.OrderID, 'zhuangtai': order.Status, 'jine': float(order.Amount) if order.Amount else 0.0, - 'tupian_url': order.ImageURL or '', + 'tupian': order.ImageURL or '', 'jieshao': order.Description or '', 'beizhu': order.Remark or '', 'nicheng': order.Nickname or '', @@ -1546,7 +1546,7 @@ class DingdanXiangqingView2(APIView): data = { 'zhuangtai': zhuangtai, - 'jiedan_dashou_id': jiedan_dashou_id, + 'dashou': jiedan_dashou_id, 'dashou_nicheng': dashou_nicheng, 'dashou_touxiang': dashou_touxiang, 'dashouliuyan': dashou_liuyan, @@ -2125,10 +2125,10 @@ class ShangjiaDingdanHuoquView(APIView): 'jieshao': order.Description or '', 'beizhu': order.Remark or '', 'nicheng': order.Nickname or '', - 'shangpin_leixing_id': order.ProductTypeID, # 返回商品类型ID - 'tupian_url': order.ImageURL or '', # 返回商品图片 - 'jiedan_dashou_id': order.PlayerID or '', # 返回打手ID - 'creat_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '' + 'leixing_id': order.ProductTypeID, + 'tupian': order.ImageURL or '', + 'jiedan_dashou_id': order.PlayerID or '', + 'create_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '' } order_list.append(order_data) @@ -2246,7 +2246,7 @@ class ShangjiaDingdanXiangqingView(APIView): 'shensuliyou': fadan_obj.AppealReason or '', 'tongyi_chufaliyou': fadan_obj.ApproveReason or '', 'bohuiliyou': fadan_obj.RejectReason or '', - 'creat_time': fadan_obj.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if fadan_obj.CreateTime else '', + 'create_time': fadan_obj.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if fadan_obj.CreateTime else '', 'update_time': fadan_obj.UpdateTime.strftime('%Y-%m-%d %H:%M:%S') if fadan_obj.UpdateTime else '', } @@ -2285,7 +2285,7 @@ class ShangjiaDingdanXiangqingView(APIView): 'jieshao': order.Description or '', 'beizhu': order.Remark or '', 'nicheng': order.Nickname or '', - 'creat_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '', + 'create_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '', # 打手信息 'dashou_yonghuid': dashou_yonghuid, @@ -3144,17 +3144,15 @@ class DashouDingdanHuoquView(APIView): 'zhuangtai': order['Status'], 'pingtai': order['Platform'], 'dashou_fencheng': float(order['PlayerCommission']) if order['PlayerCommission'] else 0.0, - 'zhiding_id': order['AssignedID'] or '', - 'shangpin_leixing_id': order['ProductTypeID'] or 0, - 'tupian_url': order['ImageURL'] or '', + 'leixing_id': order['ProductTypeID'] or 0, + 'tupian': order['ImageURL'] or '', 'yaoqiuleixing': order['GrabRequirement'] or 0, 'huiyuan_id': order['MembershipID'] or '', 'yajin': float(order['CommissionReq']) if order['CommissionReq'] else 0.0, - 'yongjin': float(order['CommissionReq']) if order['CommissionReq'] else 0.0, 'jieshao': order['Description'] or '', 'beizhu': order['Remark'] or '', 'creat_time': order['CreateTime'].strftime('%Y-%m-%d %H:%M:%S') if order['CreateTime'] else '', - 'shangjia_nicheng': order['MerchantNickname'] or '', + 'sjnicheng': order['MerchantNickname'] or '', 'zhiding_uid': order['AssignedID'] or '', 'zhiding_avatar': info.get('avatar', ''), 'zhiding_nicheng': info.get('nicheng', ''), @@ -3774,9 +3772,9 @@ class DashouDingdanHuoquView1(APIView): 'zhuangtai': order.Status, 'jine': float(order.PlayerCommission) if order.PlayerCommission else 0.0, 'jieshao': order.Description or '', - 'tupian_url': order.ImageURL or '', + 'tupian': order.ImageURL or '', 'nicheng': order.Nickname or '', - 'creat_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '' + 'create_time': order.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if order.CreateTime else '' } order_list.append(order_data) @@ -4305,10 +4303,10 @@ class DashouDingdanXiangqingView(APIView): 'zhuangtai': dingdan.Status, 'jine': float(dingdan.PlayerCommission) if dingdan.PlayerCommission else 0.0, 'jieshao': dingdan.Description or '', - 'tupian_url': dingdan.ImageURL or '', + 'tupian': dingdan.ImageURL or '', 'nicheng': dingdan.Nickname or '', 'beizhu': dingdan.Remark or '', - 'creat_time': dingdan.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if dingdan.CreateTime else '', + 'create_time': dingdan.CreateTime.strftime('%Y-%m-%d %H:%M:%S') if dingdan.CreateTime else '', 'tuikuan_liyou':dingdan.RefundReason or '', 'dashou_liuyan': dingdan.PlayerRemark or '', 'fuwudashou_id': dingdan.PlayerID or '', @@ -4470,7 +4468,7 @@ class AdGetDingdanXiangQing(APIView): 'leixing': dingdan_obj.ProductTypeID or 0, # 前端需要 leixing,对应 leixing_id 'fadanpingtai': dingdan_obj.Platform or 0, # 前端需要 fadanpingtai,对应 fadan_pingtai 'jiage': float(dingdan_obj.Amount) if dingdan_obj.Amount else 0.00, # 前端需要 jiage,对应 jine - 'tupian_url': dingdan_obj.ImageURL or '', # 前端需要 tupian_url,对应 tupian + 'tupian': dingdan_obj.ImageURL or '', 'beizhu': dingdan_obj.Remark or '', # 服务信息字段