审核结算同步

app/api/export/crud.py

@@ -28,7 +28,6 @@ def get_export_list(db: Session, source, start_time, end_time, page, size):
 
 
 def update_export(db: Session, data):
-
     try:
         db.query(ExportFile).filter(ExportFile.id == data.id).update({ExportFile.remark: data.remark})
         db.commit()

app/api/statement/guild.py

@@ -97,7 +97,7 @@ class GuildSet(object):
         list = []
         for item in data:
             item['accounts'] = item.get("pearl") + item.get("balance")
-            item['update_time']=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(item.get("update_time")))
+            item['update_time']=item.get("update_time")
             list.append(item)
         count = db.query(func.count(GuildSettlementLog.id)).filter().scalar()
         return list, count
@@ -537,12 +537,13 @@ def GuildSettlementAdd(db, data):
                     return 400, {"msg": "业务请求失败"}
             except:
                 db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
-                    {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_timestamp()})
+                    {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_datetime()})
                 db.commit()
                 return 400, {"msg": "业务请求失败"}
             db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
-                {GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_timestamp()})
+                {GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_datetime()})
             db.commit()
+        if guild_data.status==1:
             first_sta = 00
             # 钻石处理
             if guild_data.balance and guild_data.balance > 0:
@@ -558,9 +559,12 @@ def GuildSettlementAdd(db, data):
                 if is_lose:
                     return 400, {"msg": "结算错误"}
                 first_sta = 1
+                db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
+                    {GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_datetime()})
+                db.commit()
             else:
                 db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
-                    {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_timestamp()})
+                    {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_datetime()})
                 db.commit()
     else:
         db_export = GuildSettlementLog(work_id=data.id, guild_id=data.guild_id, balance=data.balance,
@@ -572,3 +576,25 @@ def GuildSettlementAdd(db, data):
         db.commit()
     return 200,{"msg": "操作成功"}
 
+
+
+
+def GuildSettlementmodify(db):
+    url ='http://106.55.103.148:8787/api/guild/getGuildSettlementLog'
+    response = requests.get(url)
+    data = json.loads(response.text)
+    for item in data.get("data"):
+        guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == item.get("id")).first()
+        if guild_data:
+            db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == item.get("id")).update(
+                {GuildSettlementLog.status: item.get("status"), GuildSettlementLog.update_time: get_now_datetime()})
+            db.commit()
+        else:
+            db_export = GuildSettlementLog(work_id=item.get("id"), guild_id=item.get("guild_id"), balance=item.get("balance"),
+                                           pearl=item.get("pearl"), status=item.get("status"), create_time=get_now_datetime(),
+                                           update_time=get_now_datetime(), guild_name=item.get("guild_name"),
+                                           guild_per=item.get("guild_per"), actual_money=item.get("actual_money"),
+                                           pledge_deposit_money=item.get("pledge_deposit_money"))
+            db.add(db_export)
+            db.commit()
+    return 200,{"msg": "操作成功"}
\ No newline at end of file

app/api/statement/schemas.py

@@ -169,3 +169,7 @@ class GuildAddLog(BaseModel):
     guild_per: Optional[str] = None
     actual_money: Optional[str] = None
     pledge_deposit_money: Optional[str] = None
+
+
+class GuildModifyLog(BaseModel):
+    guild: Optional[list] = None

app/api/statement/views.py

@@ -9,7 +9,7 @@ from fastapi import Depends, APIRouter, File, Request
 from sqlalchemy.orm import Session
 from app.api.statement.crud import RechargeStatement, WithdrawStatement, get_menu_list, get_menu_config
 from app.api.statement.guild import GuildSet, paymentset_guild_data, outon_account_data, accout_list_data, \
-    query_uuid_or_user_number, account_money, transfer_money, transfer_query, GuildSettlementAdd
+    query_uuid_or_user_number, account_money, transfer_money, transfer_query, GuildSettlementAdd, GuildSettlementmodify
 from app.api.statement.schemas import PaymentWithdrawalList, PaymentAdd, PaymentAccountlList, UserNumber, CreateBill
 from libs.img_code import new_upload_file, random_number
 from libs.result_format import HttpResultResponse, HttpMessage
@@ -265,3 +265,12 @@ def guild_add(data: schemas.GuildAddLog, db: Session = Depends(get_db)):
     """公会结算"""
     code, data = GuildSettlementAdd(db, data)
     return HttpResultResponse(code=code, data=data)
+
+
+
+
+@router.post("/guild/modify")
+def guild_modify(db: Session = Depends(get_db)):
+    """公会结算同步"""
+    code, data = GuildSettlementmodify(db)
+    return HttpResultResponse(code=code, msg=HttpMessage.SUCCESS)
\ No newline at end of file