累死了,删除了所有跨平台逻辑,进行了表迁移
This commit is contained in:
@@ -26,12 +26,7 @@ class Dingdan(models.Model):
|
||||
# 订单描述信息
|
||||
jieshao = models.TextField(null=True, blank=True, verbose_name='订单介绍')
|
||||
beizhu = models.TextField(null=True, blank=True, verbose_name='订单备注')
|
||||
partner_order_id = models.CharField(max_length=32, null=True, blank=True, db_index=True,verbose_name='对方平台订单ID')
|
||||
is_cross = models.IntegerField(default=0, verbose_name='是否跨平台订单(0否,1是)')
|
||||
|
||||
dispatch_type = models.IntegerField(default=0, choices=[(1, '我方派单'), (2, '对方派单')], verbose_name='派发情况')
|
||||
# 🔥 新增:对方俱乐部ID
|
||||
partner_club_id = models.CharField(max_length=6, null=True, blank=True, db_index=True, verbose_name='对方俱乐部ID')
|
||||
# 新增字段:游戏昵称(前端提交的游戏昵称)
|
||||
nicheng = models.CharField(max_length=50, null=True, blank=True, verbose_name='游戏昵称')
|
||||
user1_id = models.CharField(max_length=30,null=True, db_index=True, verbose_name='用户1标识')
|
||||
@@ -112,7 +107,6 @@ class DingdanShangjia(models.Model):
|
||||
sqzhuangtai =models.IntegerField(default=0, null=True, blank=True, verbose_name='处罚申请状态:0待处理,1成功,2驳回')
|
||||
bhliyou = models.TextField(null=True, blank=True, verbose_name='驳回商家处罚理由')
|
||||
sjnicheng =models.CharField(max_length=50,null=True, verbose_name='商家昵称')
|
||||
partner_yonghu_id = models.CharField(max_length=32, blank=True, null=True, verbose_name='对方平台用户ID')
|
||||
# 在 dingdan/models.py 的 DingdanShangjia 类中添加
|
||||
shangyige_dingdan_id = models.CharField(
|
||||
max_length=32,
|
||||
@@ -186,9 +180,6 @@ class DingdanPeihu(models.Model):
|
||||
|
||||
|
||||
|
||||
# 建议路径:dingdan/models.py 或 独立 fadan/models.py
|
||||
from django.db import models
|
||||
|
||||
class Fadan(models.Model):
|
||||
"""罚单表——平台各类处罚信息"""
|
||||
id = models.AutoField(primary_key=True, verbose_name='自增主键')
|
||||
@@ -206,8 +197,6 @@ class Fadan(models.Model):
|
||||
create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
# 在 Fadan 模型中添加
|
||||
partner_club_id = models.CharField(max_length=6, blank=True, null=True, db_index=True, verbose_name='对方俱乐部ID')
|
||||
# 在 class Fadan 中添加
|
||||
shenqingren_shenfen = models.IntegerField(
|
||||
choices=[(1, '客服'), (2, '售后'), (3, '管理员'),(4,'店铺'),(5,'商家')], # 按实际扩展
|
||||
default=1,
|
||||
@@ -310,88 +299,6 @@ class FadanFenhongLilv(models.Model):
|
||||
|
||||
|
||||
|
||||
class CrossPlatformOrderData(models.Model):
|
||||
"""
|
||||
跨平台订单扩展数据表
|
||||
存储我方订单与对方平台订单的关联及对方订单状态
|
||||
"""
|
||||
dingdan_id = models.CharField(max_length=32, unique=True, db_index=True, verbose_name='我方订单ID')
|
||||
partner_order_id = models.CharField(max_length=32, db_index=True, verbose_name='对方平台订单ID')
|
||||
partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID')
|
||||
partner_order_status = models.IntegerField(default=0, verbose_name='对方平台订单状态') # 对方订单当前状态码
|
||||
partner_dashou_id = models.CharField(max_length=32, blank=True, default='', verbose_name='对方平台接单打手ID')
|
||||
partner_amount = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='对方平台订单金额')
|
||||
create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
|
||||
class Meta:
|
||||
db_table = 'cross_platform_order_data'
|
||||
verbose_name = '跨平台订单扩展'
|
||||
verbose_name_plural = '跨平台订单扩展'
|
||||
indexes = [
|
||||
models.Index(fields=['dingdan_id']),
|
||||
models.Index(fields=['partner_order_id']),
|
||||
models.Index(fields=['partner_club_id']),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.dingdan_id} -> {self.partner_order_id}"
|
||||
|
||||
|
||||
|
||||
|
||||
# apps/dingdan/models.py 中添加
|
||||
|
||||
class PreSettlement(models.Model):
|
||||
"""
|
||||
预结算表
|
||||
用于记录对方平台派单订单的待结算款项,等待对方确认后才能真正入账
|
||||
"""
|
||||
STATUS_CHOICES = (
|
||||
(0, '待结算'),
|
||||
(1, '已结算'),
|
||||
(2, '已拒绝'),
|
||||
)
|
||||
# 我方订单ID
|
||||
dingdan_id = models.CharField(max_length=32, db_index=True, verbose_name='我方订单ID')
|
||||
# 对方订单ID
|
||||
partner_order_id = models.CharField(max_length=32, db_index=True, verbose_name='对方订单ID')
|
||||
# 对方俱乐部ID
|
||||
partner_club_id = models.CharField(max_length=6, db_index=True, verbose_name='对方俱乐部ID')
|
||||
# 接单打手ID
|
||||
dashou_id = models.CharField(max_length=7, db_index=True, verbose_name='接单打手ID')
|
||||
# 打手应分金额
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='打手应分金额')
|
||||
# 订单金额(原金额,可选)
|
||||
order_amount = models.DecimalField(max_digits=10, decimal_places=2, default=0.00, verbose_name='订单原金额')
|
||||
# 结算状态
|
||||
status = models.SmallIntegerField(choices=STATUS_CHOICES, default=0, verbose_name='结算状态')
|
||||
# 处理时间(结算或拒绝的时间)
|
||||
process_time = models.DateTimeField(null=True, blank=True, verbose_name='处理时间')
|
||||
# 处理客服/对方操作人(可选)
|
||||
operator = models.CharField(max_length=32, blank=True, default='', verbose_name='操作人')
|
||||
create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
update_time = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
|
||||
class Meta:
|
||||
db_table = 'pre_settlement'
|
||||
verbose_name = '预结算表'
|
||||
verbose_name_plural = verbose_name
|
||||
unique_together = [['dingdan_id', 'dashou_id']]
|
||||
indexes = [
|
||||
models.Index(fields=['dingdan_id']),
|
||||
models.Index(fields=['partner_order_id']),
|
||||
models.Index(fields=['partner_club_id']),
|
||||
models.Index(fields=['dashou_id']),
|
||||
models.Index(fields=['status']),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f"预结算-{self.dingdan_id} -> {self.partner_order_id}"
|
||||
|
||||
|
||||
# apps/dingdan/models.py 中添加
|
||||
|
||||
class OrderDashouHistory(models.Model):
|
||||
"""
|
||||
订单打手变更历史表
|
||||
|
||||
Reference in New Issue
Block a user