新增基金的数据联动接口3

app/controller/update_report.py

@@ -14,12 +14,7 @@ import uuid
 import oss2
 from flask_restful import Resource, reqparse
 from flask import request, render_template, g
-from flask import make_response
-
-from app.api.engine import config
 from app.service.folio_comment_service import recalculation_fund_comment
-from app.service.report_service import get_report_list, delete_report, get_one_report, edit_report, make_report, edit_report_name
-from app.service.template_manage_service import get_make_report_data
 from app.utils.auth import login_require
 from app.utils.format_transfer import npEncoder
 
@@ -40,7 +35,13 @@ class UpdateReportHandlers(Resource):
         args = self.parser.parse_args()
         args['ifa_id'] = g.ifa_id
         data = recalculation_fund_comment(args)
-        # data = make_report(args)
+        if data is False:
+            resq = {
+                "statusCode": "8888",
+                "message": "内部错误",
+                "attributes": data
+            }
+            return resq
         resp = {
             "statusCode": "0000",
             "message": "成功",

app/service/folio_comment_service.py

 from app.service.portfolio_diagnose import PortfolioDiagnose
 from app.service.result_service_v2 import UserCustomerResultAdaptor
 import datetime
-
+import json
 from app.utils.draw import draw_combination_chart
+from app.utils.format_transfer import npEncoder
 
 
 def recalculation_fund_comment(args):
+    try:
         ifa_id = args.get("ifa_id")
         customer_id = args.get("customer_id")
         folio = args.get("folio")
-    suggest_result = args.get("suggest_data")
+        suggest_result = json.loads(args.get("suggest_data"))
 
         suggest_fund_dict = {}
         suggest_fund_list = []
@@ -48,5 +50,7 @@ def recalculation_fund_comment(args):
             finall_reslut["return_compare_data"]["new_combination"],
             finall_reslut["return_compare_data"]["origin_combination"],
             finall_reslut["return_compare_data"]["index"])
+    except Exception as e:
+        return False
 
-    return finall_reslut
\ No newline at end of file
+    return json.dumps(finall_reslut, cls=npEncoder, ensure_ascii=False)