Merge remote-tracking branch 'origin/development' into development

.idea/financial-system.iml

@@ -6,7 +6,7 @@
       <excludeFolder url="file://$MODULE_DIR$/fs-env" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (financial-system)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

app/api/account/crud.py

@@ -284,9 +284,9 @@ def update_account_type(db: Session, data):
         return False
 
 
-def get_account_type_value(db: Session, key):
+def get_account_type_value(db: Session, key, type):
     """新建类型 查询是否有重复数据"""
-    return db.query(AccountType).filter(AccountType.key_value == key).first()
+    return db.query(AccountType).filter(AccountType.key_value == key, AccountType.type == type).first()
 
 
 def create_type(db: Session, data):

app/api/account/views.py

@@ -142,7 +142,7 @@ def finance_fix(data: schemas.AccountTypeList, token=Depends(login_required), db
 @router.post("/create/type")
 def create_user(data: schemas.CreateType, token=Depends(login_required), db: Session = Depends(get_db)):
     """添加账目类型"""
-    res_type = crud.get_account_type_value(db, data.key_value)
+    res_type = crud.get_account_type_value(db, data.key_value, data.type)
     if res_type:
         return HttpResultResponse(code=400, msg=HttpMessage.TYPE_EXIST)
     res = crud.create_type(db, data)

app/api/statement/guild.py

@@ -102,15 +102,15 @@ class GuildSet(object):
         count = db.query(func.count(GuildSettlementLog.id)).filter().scalar()
         return list, count
 
-    def update_guild_info(self, data):
-        """公会结算修改"""
-        id = data.get("id")
-        guild_sql = f"SELECT count(*) FROM `guild_settlement_log` where id={id})"
-        guild_data = self.linkmysql.query_mysql(guild_sql)
-        if guild_data:
-            status = 1 if data.get("status") == 0 else 2
-            guild_sql = f"UPDATE guild_settlement_log set status={status}   where id={id}"
-            self.linkmysql.excete_mysql(guild_sql)
+    # def update_guild_info(self, data):
+    #     """公会结算修改"""
+    #     id = data.get("id")
+    #     guild_sql = f"SELECT count(*) FROM `guild_settlement_log` where id={id})"
+    #     guild_data = self.linkmysql.query_mysql(guild_sql)
+    #     if guild_data:
+    #         status = 1 if data.get("status") == 0 else 2
+    #         guild_sql = f"UPDATE guild_settlement_log set status={status}   where id={id}"
+    #         self.linkmysql.excete_mysql(guild_sql)
 
 
 def paymentset_guild_data(page, size, start_time, end_time):
@@ -395,7 +395,6 @@ def create_fix_table(db: Session, param, h_list):
             "timestamp": get_now_timestamp()
         }
     clearing_res = search(data, method)
-    print(clearing_res)
     if clearing_res['status']:
         unique_res = []
         if param.type == 0:
@@ -544,7 +543,7 @@ def GuildSettlementAdd(db, data):
         if guild_data.status == 0:
             first_sta = 00
             # 钻石处理
-            if guild_data.balance and guild_data.balance> 0:
+            if guild_data.balance and guild_data.balance > 0:
                 balance_refer_num = f'guild_settlement_{data.id}_balance'
                 is_failure = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.balance, 'guild_clear', 'consumable', balance_refer_num, [], 1, acc_info[0]['uuid'])
                 if is_failure:

app/api/statement/views.py

@@ -62,7 +62,7 @@ def guild_withdrawal_list(request:Request,db: Session = Depends(get_db),page: Op
 
 @router.get("/guild/settlement")
 def guild_settlement_list(db: Session = Depends(get_db),page: Optional[int] = 1, size: Optional[int] = 10,status:Optional[int]='',start_time:Optional[str]='',end_time:Optional[str]="",guild_id:Optional[str]=""):
-    """公会结算"""
+    """申请结算列表"""
     guild_list, total = GuildSet().get_guild_data(db,page, size,status,start_time,end_time,guild_id)
     return HttpResultResponse(total=total, data=guild_list)
 
@@ -195,7 +195,7 @@ def finance_fix(data: acc_schemas.RecoveryTable, token=Depends(login_required),
     """新增异常数据修复"""
     if not all([data.uuid, data.from_time, data.cont]):
         return HttpResultResponse(code=500, msg='缺少必传参数')
-    if data.out_money == None or data.entry_money == None:
+    if data.out_money is None or data.entry_money is None:
         return HttpResultResponse(code=500, msg='缺少必传参数')
     res = guild.create_recovery_table(data)
     if res:

libs/functions.py

@@ -167,12 +167,16 @@ def gen_dates(b_date, days):
 def get_date_list(start, end):
     """
     获取n天前日期列表
-    :param n: 几天前
+    :param start: 开始时间 2023-04-01
+    :param end: 结束时间 2023-04-01
     :return:
     """
+    if start == end:
+        end_time = datetime.strptime(start, "%Y-%m-%d") + timedelta(days=1)
+    else:
+        end_time = datetime.strptime(end, "%Y-%m-%d")
     data = []
     start_time = datetime.strptime(start, "%Y-%m-%d")
-    end_time = datetime.strptime(end, "%Y-%m-%d")
     for ym in gen_dates(start_time, (end_time - start_time).days):
         year_month = ym.strftime('%Y%m')
         data.append(year_month)

models/guild.py

@@ -140,11 +140,14 @@ class GuildSettlementLog(Base, SerializerMixin):
     work_id =Column(Integer, comment="业务id")
     guild_id = Column(Integer, comment="公会id")
     balance = Column(DECIMAL(15,3),default='0.000',comment="结算时的钻石,RMB单位")
+    bank_name =Column(String(122), comment="开户行名称")
+    bank_no =Column(String(122), comment="账户名称")
+    guild_name =Column(String(122), comment="公会名字")
     pearl = Column(DECIMAL(15,3),default='0.000', comment="结算时候的珍珠，RMB单位")
     status = Column(Integer, comment="0待结算，1待结款，2已完成")
     create_time = Column(Integer,default='0',comment="创建时间")
-    update_time = Column(Integer,default='0',comment="修改时间")
-    guild_name = Column(Integer, comment="公会名字")
+    update_time = Column(DateTime,default='0',comment="修改时间")
+    account_name = Column(String(122), comment="户头名称")
     guild_per = Column(String(122), comment="公会比例")
     actual_money = Column(DECIMAL(15,3), default='0.000', comment="实际结款")
     pledge_deposit_money = Column(DECIMAL, default='0.000', comment="质押金金额")