bugfix

pricing/pricing.py

@@ -413,21 +413,23 @@ order by b.enabled_date desc"""
 				# p[f'mapping_{k}'] = data_mapping(d, k, data_value) #需要mapping的数据转换
 				data_value = data_mapping(d, k, data_value)
 				if data_value is None:
-					e = f'数据({config_data})没有({k})数据'
+					if 'default' in f.keys():
-					exception(e)
+						data_value = f['default']
-					raise Exception(e)
+					else:
-				else:
+						e = f'数据({config_data})没有({k})数据'
-					try:
+						exception(e)
-						flg = check_value(f, spec_value, data_value)
+						raise Exception(e)
-						if not flg:
+				try:
-							# 条件不满足
+					flg = check_value(f, spec_value, data_value)
-							# debug(f'条件不满足:{p=},{spec_value=}, {data_value=}, {k=}') 
+					if not flg:
-							p_ok = False
+						# 条件不满足
-							break
+						# debug(f'条件不满足:{p=},{spec_value=}, {data_value=}, {k=}') 
-					except Exception as e:
+						p_ok = False
-						msg = f'{p=},{f}: {spec_value=}, {data_value=}'
-						exception(f'{e}:{msg}')
 						break
+				except Exception as e:
+					msg = f'{p=},{f}: {spec_value=}, {data_value=}'
+					exception(f'{e}:{msg}')
+					break
 			if p_ok and p.formula:
 				np = p.copy()
 				formula = p.formula