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

app/api/export/crud.py

@@ -274,26 +274,13 @@ class ReferenceTypeClassification():
             op['money'] = round(float(op['amount']), 2)
             if op.get('uuid') in guild_data:
                 op['nickname'] = '公会'
-            elif op.get('uuid') in anchor_data:
-                if op.get('reference_type') == 'studioGift':
-                    if op.get('amount_type') == 'backpack':
-                        op['nickname'] = '背包送出'
-                    elif op.get('amount_type') == 'consumable':
-                        op['nickname'] = '钻石送出'
-                    else:
-                        op['nickname'] = '主播'
-                else:
-                    op['nickname'] = '主播'
             elif account_dict.get(op['uuid']):
                 op['nickname'] = account_dict.get(op['uuid'])
             else:
-                if op.get('reference_type') == 'studioGift':
-                    if op.get('amount_type') == 'backpack':
-                        op['nickname'] = '背包送出'
-                    elif op.get('amount_type') == 'consumable':
-                        op['nickname'] = '钻石送出'
-                    else:
-                        op['nickname'] = '用户'
+                if op.get('amount_type') == 'backpack':
+                    op['nickname'] = '背包账户'
+                elif op.get('amount_type') == 'consumable':
+                    op['nickname'] = '钻石账户'
                 else:
                     op['nickname'] = '用户'
             if op.get('type') == 0: