Merge branch 'ps_03' into 'main'

update 代偿信息（新增/编辑）

See merge request root/guarantee-admin-api-v0.2!9

Modules/Company/CompanyManageImpl.py

@@ -200,7 +200,6 @@ class CompanyManageImpl(object):
         )
         return '修改成功'
 
-
     @staticmethod
     def get_repay(**kwargs):
 
@@ -222,32 +221,30 @@ class CompanyManageImpl(object):
 
     @staticmethod
     def edit_repay(**kwargs):
-
-        def make_new_gid():
-            new_gid = CommonUtils.random_code(8)
-            case = DB_GUA.find_single_column(
-                "企业数据",
-                "代偿信息",
-                {"担保ID": new_gid},
-                "企业ID"
-            ) is not None
-            while case:
-                new_gid = CommonUtils.random_code(8)
-            return new_gid
-
-        compensation = GuaranteeInfo.CompensationInfo()
-        compensation.compensation_id = make_new_gid()
-        compensation.project_name = kwargs["project_name"]
-        compensation.compensation_amount = kwargs["repay_amount"]
-        compensation.compensation_recovery_amount = kwargs["repay_recycle_amount"]
-        compensation.compensation_date = kwargs["repay_date"]
-
-        DB_GUA.upsert_single_data(
+        edit_data = SpecObject.set_specify_instance(
+            instance=GuaranteeInfo.CompensationInfo,
+            data=kwargs['data']
+        )
+        DB_GUA.update_single_data(
             "企业数据",
             "代偿信息",
-            {"担保ID": compensation.compensation_id},
-            compensation.fields_toggle()
+            {"担保ID": kwargs['data']['担保ID'], "项目名称": kwargs['data']['项目名称']},
+            edit_data.fields_toggle()
         )
+        return '修改成功'
+
+    @staticmethod
+    def new_repay(**kwargs):
+        edit_data = SpecObject.set_specify_instance(
+            instance=GuaranteeInfo.CompensationInfo,
+            data=kwargs['data']
+        )
+        DB_GUA.insert_single_data(
+            "企业数据",
+            "代偿信息",
+            edit_data.fields_toggle()
+        )
+        return '新增成功'
 
     @staticmethod
     def get_rating_records(**kwargs):

Modules/Company/CompanyRoutes.py

@@ -214,23 +214,16 @@ def repay_route(**kwargs):
             RouteParamsCheck(
                 request.json,
                 [
-                    "project_name", "repay_amount", "repay_recycle_amount", "repay_date"
+                    "担保ID", "项目名称", "代偿金额(万元)", "代偿回收金额(万元)", "代偿日期"
                 ]
             ).required()
-
-            project_name = request.json["project_name"]
-            repay_amount = request.json["repay_amount"]
-            repay_recycle_amount = request.json["repay_recycle_amount"]
-            repay_date = request.json["repay_date"]
-
             impl = CompanyManageImpl()
-            impl.edit_repay(
-                project_name=project_name,
-                repay_amount=repay_amount,
-                repay_recycle_amount=repay_recycle_amount,
-                repay_date=repay_date,
-            )
-            return {"info": "担保信息", "result": "操作成功"}, 200
+            data = request.json
+            if 'new' in request.args.keys():
+                result = impl.new_repay(data=data)
+            else:
+                result = impl.edit_repay(data=data)
+            return {"info": "代偿信息", "result": result}, 200
 
     except APIReturnError as e:
         return {"info": e.__str__()}, e.status_code