XingQue/Django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

彻底解决了 create_time 的问题，将所有字段都改为了 CreateTime

Browse Source
This commit is contained in:
TermiNexus
2026-06-19 19:19:22 +08:00
parent 90e0bde7f1
commit e64697b64a
35 changed files with 4803 additions and 4872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
users/tixian_shenhe_services.py
View File

@@ -439,7 +439,7 @@ def _get_active_auto_record(shenhe_danhao):
shenhe_danhao=shenhe_danhao,
zhuangtai__in=[0, 1],
)
.order_by('-create_time')
.order_by('-CreateTime')
.first()
)
@@ -731,7 +731,7 @@ def _quota_already_reserved_for_record(auto_record):
other_sum = TixianAutoRecord.query.filter(
leixing=auto_record.leixing,
zhuangtai__in=[0, 1],
create_time__date=today,
CreateTime__date=today,
).exclude(tixian_id=auto_record.tixian_id).aggregate(
total=Sum('shijidaozhang'),
)['total'] or decimal.Decimal('0.00')
@@ -912,7 +912,7 @@ def sync_audit_and_jilu_status(audit, new_status, **extra_fields):
setattr(audit, k, v)
audit.save()
if audit.tixianjilu_id:
update_fields = {'zhuangtai': new_status, 'update_time': timezone.now()}
update_fields = {'zhuangtai': new_status, 'UpdateTime': timezone.now()}
if 'bhliyou' in extra_fields:
update_fields['bhliyou'] = extra_fields['bhliyou']
Tixianjilu.query.filter(id=audit.tixianjilu_id).update(**update_fields)
@@ -925,7 +925,7 @@ def _close_auto_record_failed(auto_record, fail_reason):
reason = (fail_reason or '打款失败')[:500]
auto_record.zhuangtai = 2
auto_record.fail_reason = reason
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'UpdateTime'])
release_collect_quota_for_record(auto_record)
@@ -1059,7 +1059,7 @@ def mark_transfer_success(auto_record, *, wechat_transfer_no=None, with_accounti
return False
ar.zhuangtai = 1
update_fields = ['zhuangtai', 'update_time']
update_fields = ['zhuangtai', 'UpdateTime']
if wechat_transfer_no:
ar.wechat_transfer_no = wechat_transfer_no
update_fields.append('wechat_transfer_no')
@@ -1087,7 +1087,7 @@ def mark_transfer_success(auto_record, *, wechat_transfer_no=None, with_accounti
def _sync_record_from_wx_query(auto_record, wx_data):
"""根据微信查单结果修正本地打款记录，返回 (action, payload)"""
if wx_data.get('_not_found'):
age = timezone.now() - auto_record.create_time
age = timezone.now() - auto_record.CreateTime
if auto_record.zhuangtai == 0 and age < timedelta(minutes=PENDING_QUERY_GRACE_MINUTES):
return RECONCILE_PENDING, {
'msg': '有收款处理中，请稍后再试',
@@ -1096,7 +1096,7 @@ def _sync_record_from_wx_query(auto_record, wx_data):
if auto_record.zhuangtai == 0:
auto_record.zhuangtai = 2
auto_record.fail_reason = '微信未找到该打款单，请重新发起收款'
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'UpdateTime'])
release_collect_quota_for_record(auto_record)
return RECONCILE_ALLOW_NEW, {}
@@ -1118,7 +1118,7 @@ def _sync_record_from_wx_query(auto_record, wx_data):
}
if auto_record.zhuangtai == 0:
auto_record.wechat_package = json.dumps(package, ensure_ascii=False)
auto_record.save(update_fields=['wechat_package', 'update_time'])
auto_record.save(update_fields=['wechat_package', 'UpdateTime'])
wx_cfg = settings.WECHAT_PAY_V3_CONFIG
return RECONCILE_WAIT_CONFIRM, {
'tixian_id': auto_record.tixian_id,
@@ -1143,7 +1143,7 @@ def _sync_record_from_wx_query(auto_record, wx_data):
if auto_record.zhuangtai != 1:
auto_record.zhuangtai = 2
auto_record.fail_reason = fail_reason
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'update_time'])
auto_record.save(update_fields=['zhuangtai', 'fail_reason', 'UpdateTime'])
release_collect_quota_for_record(auto_record)
if auto_record.shenhe_danhao:
try:
@@ -1171,14 +1171,14 @@ def get_auto_record_for_collect(shenhe_danhao):
"""
pending = (
TixianAutoRecord.query.filter(shenhe_danhao=shenhe_danhao, zhuangtai=0)
.order_by('-create_time')
.order_by('-CreateTime')
.first()
)
if pending:
return pending
return (
TixianAutoRecord.query.filter(shenhe_danhao=shenhe_danhao)
.order_by('-create_time')
.order_by('-CreateTime')
.first()
)
@@ -1190,7 +1190,7 @@ def reconcile_shenhe_wechat_bills(shenhe_danhao):
返回 (action, payload)
"""
records = list(
TixianAutoRecord.query.filter(shenhe_danhao=shenhe_danhao).order_by('-create_time')
TixianAutoRecord.query.filter(shenhe_danhao=shenhe_danhao).order_by('-CreateTime')
)
if any(r.zhuangtai == 1 for r in records):