Merge remote-tracking branch 'origin/manage-public' into manage-public

app/celery.py

@@ -11,7 +11,7 @@ from app.utils.jinjia2html_v2 import DataIntegrate
 
 celery_app = Celery(__name__)
 
-celery_conf = "redis://:{}@{}:{}/{}".format(redis_password,redis_host[0],redis_port[0],"3")
+celery_conf = "redis://:{}@{}:{}/{}".format(redis_password,redis_host[0],redis_port[0],redis_db[0])
 celery_app.conf.update({"broker_url": celery_conf, "result_backend": celery_conf})
 
 

app/config/config.yaml

@@ -43,6 +43,11 @@ test:
       port: 56379
       db: 0
       password: 'qimeng123'
+  celery:
+      host: 118.190.63.109
+      port: 56379
+      db: 1
+      password: 'qimeng123'
   oss:
     imgs_url_prefix: https://testtamper.tanpuyun.com/hangjiapc/report/productionenv/ReportTempImg/
     pdf_url_prefix: https://testtamper.tanpuyun.com/hangjiapc/report/productionenv/AppHoldReport/
@@ -72,7 +77,7 @@ prod:
   celery:
       host: 118.190.63.109
       port: 56379
-      db: 0
+      db: 3
       password: 'qimeng123'
 
   oss:

app/controller/statement.py

+# -*- coding: UTF-8 -*-
+"""
+@author:Zongxi.Li
+@file:statement.py
+@time:2021/02/02
+"""
+import json
+from datetime import datetime, date
+from decimal import Decimal
+
+from flask_restful import Resource, reqparse
+from app.service.statement_service import Statement
+from app.utils.auth import login_require
+from flask import g
+
+
+class DateEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, (datetime, date)):
+            return obj.__str__()
+        if isinstance(obj, Decimal):
+            return obj.__float__()
+        return json.JSONEncoder.default(self, obj)
+
+
+class StatementController(Resource):
+    def __init__(self):
+        """."""
+        self.parser = reqparse.RequestParser()
+
+    @login_require
+    def get(self):
+        """"""
+        # self.parser.add_argument('user_id', type=str, required=True, help='用户id不能为空')
+        self.parser.add_argument('statement_time', required=False, help='对账单时间戳')
+        args = self.parser.parse_args()
+        print(args.get('statement_time'))
+        # user_id = args.get('user_id')
+        user_id = g.ifa_id
+        print(user_id)
+        if args.get('statement_time') != '':
+            year = datetime.fromtimestamp(int(args.get('statement_time')) / 1000).year
+            month = datetime.fromtimestamp(int(args.get('statement_time')) / 1000).month
+        else:
+            year = datetime.now().year
+            month = datetime.now().month - 1
+        data = Statement(user_id=user_id, year=year, month=month).summary()
+        resp = {
+            "statusCode": "0000",
+            "message": "成功",
+            "attributes": data
+        }
+        return json.loads(json.dumps(resp, cls=DateEncoder, ensure_ascii=False))

app/router/version1.py

@@ -10,6 +10,7 @@ from app.controller.customer import CustomerList
 from app.controller.fund import FundEvaluation
 from app.controller.report import *
 from app.controller.template_manage import *
+from app.controller.statement import StatementController
 
 def add_route(api):
     """注册路由"""
@@ -20,4 +21,5 @@ def add_route(api):
     api.add_resource(TemplateList, '/api/template_list')
     api.add_resource(CustomerList, '/api/customer_list')
     api.add_resource(FundEvaluation, '/api/fund_evaluation')
+    api.add_resource(StatementController, '/api/statement')