优化充值列表

app/api/statement/crud.py

@@ -115,9 +115,21 @@ class RechargeStatement(object):
                 if o_id not in self.order_id:
                     self.order_id.append(o_id)
         Logger().logger.info("获取筛选条件")
+        pay_discount = [i['uuid'] for i in query_data]
+        pay_discount.append('_')  # 防止列表长度为1，sql查询tuple（）报错
+        nick_sql = f"SELECT uuid,nick_name FROM v2_user where uuid in{tuple(pay_discount)}"
+        nick_data = LinkMysql(env.DB_3YV2).query_mysql(nick_sql)
+        # nick_dict = {i: nick_data[i] for i in nick_data}
+        nick_dict = {i['uuid']: i['nick_name'] for i in nick_data}
         if not self.order_id:
+            for ni in query_data:
+                ni['nick_name'] = nick_dict[ni['uuid']]
+                ni['status'] = 1
             return query_data
-        o_sql = f"SELECT o.id,o.money,o.userid,v.nick_name,o.status,o.paychannel,o.sid,o.current FROM orders as o LEFT JOIN v2_user as v on o.userid=v.user_id where o.id in{tuple(self.order_id)}"
+        if len(self.order_id) == 1:
+            o_sql = f"SELECT o.id,o.money,o.userid,v.nick_name,o.status,o.paychannel,o.sid,o.current FROM orders as o LEFT JOIN v2_user as v on o.userid=v.user_id where o.id={self.order_id[0]}"
+        else:
+            o_sql = f"SELECT o.id,o.money,o.userid,v.nick_name,o.status,o.paychannel,o.sid,o.current FROM orders as o LEFT JOIN v2_user as v on o.userid=v.user_id where o.id in{tuple(self.order_id)}"
         order_data = LinkMysql(env.DB_3YV2).query_mysql(o_sql)
         Logger().logger.info("查询支付配置")
         p_sql = "SELECT id,name FROM pay_config"
@@ -126,7 +138,10 @@ class RechargeStatement(object):
         for i in pay_data:
             pay_dict[i['id']] = i['name']
         for x in query_data:
-            ref_type, o_id = x['reference_number'].split('_')
+            if x['reference_type'] == 'userRecharge':
+                ref_type, o_id = x['reference_number'].split('_')
+            else:
+                o_id = '1'
             for y in order_data:
                 if o_id == str(y['id']):
                     x['user_id'] = y['userid']
@@ -134,6 +149,9 @@ class RechargeStatement(object):
                     x['status'] = y['status']
                     x['paychannel'] = pay_dict.get(y['paychannel'], y['paychannel'])
                     x['sid'] = y['sid']
+                else:
+                    x['nick_name'] = nick_dict[x['uuid']]
+                    x['status'] = 1
         Logger().logger.info(f"拼接的数据：{query_data[0]}")
         return query_data