fix: 所有Message加timeout, NaN过滤

This commit is contained in:
yumoqing 2026-06-29 16:59:16 +08:00
parent 34843b6634
commit 7e3af2d9b8

View File

@ -1,7 +1,7 @@
# Upsert折扣明细对比old_discount和discount不同才更新 # Upsert折扣明细对比old_discount和discount不同才更新
# 参数: discountid, productid, discount, old_discount, detail_id(可选) # 参数: discountid, productid, discount, old_discount, detail_id(可选)
result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid', 'type': 'error'}} result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid', 'type': 'error', 'timeout': 3}}
try: try:
discountid = params_kw.get('discountid') discountid = params_kw.get('discountid')
@ -28,7 +28,7 @@ try:
if discount_val is not None and old_discount is not None: if discount_val is not None and old_discount is not None:
try: try:
if float(discount_val) == float(old_discount): if float(discount_val) == float(old_discount):
result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣未变化', 'type': 'success'}} result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣未变化', 'type': 'success', 'timeout': 3}}
return result return result
except: except:
pass pass
@ -41,9 +41,9 @@ try:
if detail_id: if detail_id:
async with DBPools().sqlorContext(dbname) as sor: async with DBPools().sqlorContext(dbname) as sor:
await sor.D('discount_detail', {'id': detail_id}) await sor.D('discount_detail', {'id': detail_id})
result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣已清除', 'type': 'success'}} result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣已清除', 'type': 'success', 'timeout': 3}}
else: else:
result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': 'ok', 'type': 'success'}} result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': 'ok', 'type': 'success', 'timeout': 3}}
return result return result
async with DBPools().sqlorContext(dbname) as sor: async with DBPools().sqlorContext(dbname) as sor:
@ -62,10 +62,10 @@ try:
'discount': float(discount_val) 'discount': float(discount_val)
}) })
result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣保存成功', 'type': 'success'}} result = {'widgettype': 'Message', 'options': {'title': 'Success', 'message': '折扣保存成功', 'type': 'success', 'timeout': 3}}
except Exception as e: except Exception as e:
debug(f'save_discount error: {format_exc()}') debug(f'save_discount error: {format_exc()}')
result['options'] = {'title': 'Error', 'message': f'保存失败: {str(e)}', 'type': 'error'} result['options'] = {'title': 'Error', 'message': f'保存失败: {str(e)}', 'type': 'error', 'timeout': 5}
return result return result