Merge branch 'fix/1207' into feature/se
Showing
1 changed file
with
4 additions
and
4 deletions
... | @@ -1113,7 +1113,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list): | ... | @@ -1113,7 +1113,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list): |
1113 | asp_list = [] | 1113 | asp_list = [] |
1114 | gzs_status = consts.GZS_STATUS[1] | 1114 | gzs_status = consts.GZS_STATUS[1] |
1115 | gzs_price = '0.00' | 1115 | gzs_price = '0.00' |
1116 | for asp_info in cms_info.get('associatedServices', []): | 1116 | for asp_info in cms_info.get('associatedServices', {}).get('SubassociatedServices', []): |
1117 | tmp_asp_name = asp_info.get('associatedServices') | 1117 | tmp_asp_name = asp_info.get('associatedServices') |
1118 | if isinstance(tmp_asp_name, str) and len(tmp_asp_name) > 0: | 1118 | if isinstance(tmp_asp_name, str) and len(tmp_asp_name) > 0: |
1119 | if gzs_status == consts.GZS_STATUS[1] and tmp_asp_name.find(consts.GZS_NAME) != -1: | 1119 | if gzs_status == consts.GZS_STATUS[1] and tmp_asp_name.find(consts.GZS_NAME) != -1: |
... | @@ -1127,16 +1127,16 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list): | ... | @@ -1127,16 +1127,16 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list): |
1127 | ) | 1127 | ) |
1128 | ) | 1128 | ) |
1129 | 1129 | ||
1130 | fin_total = 0 | 1130 | fin_total_tmp = cms_info.get('associatedServices', {}).get('financed total', '0.00') |
1131 | fin_total = '0.00' if fin_total_tmp.strip() == '' else fin_total_tmp | ||
1131 | for asp_name, _, asp_fin in asp_list: | 1132 | for asp_name, _, asp_fin in asp_list: |
1132 | if gzs_status == consts.GZS_STATUS[2] and asp_name.find(consts.GZS_NAME) == -1: | 1133 | if gzs_status == consts.GZS_STATUS[2] and asp_name.find(consts.GZS_NAME) == -1: |
1133 | gzs_status = consts.GZS_STATUS[0] | 1134 | gzs_status = consts.GZS_STATUS[0] |
1134 | fin_total += float(asp_fin) | ||
1135 | asp_list.append( | 1135 | asp_list.append( |
1136 | ( | 1136 | ( |
1137 | consts.ASP_SUM_NAME, | 1137 | consts.ASP_SUM_NAME, |
1138 | '', | 1138 | '', |
1139 | format(fin_total, '.2f') | 1139 | fin_total, |
1140 | ) | 1140 | ) |
1141 | ) | 1141 | ) |
1142 | afc_contract_input.append((consts.SE_AFC_CON_FIELD[20], asp_list)) | 1142 | afc_contract_input.append((consts.SE_AFC_CON_FIELD[20], asp_list)) | ... | ... |
-
Please register or sign in to post a comment