update for wage

panel/KillHouse/views.py

@@ -3175,6 +3175,12 @@ class KillRequestViewSet(viewsets.ModelViewSet):
                     except:
                         recive_date = datetime.strptime(str(request.data['recive_date']), '%Y-%m-%d %H:%M:%S').date()
                     total_unpaid_wage = get_finance_info(kill_house)['total_price']
+                    if kill_house.killer and kill_house.type == 'public':
+                        slaughter_transactions = InternalTransaction.objects.filter(
+                            kill_house=kill_house,parent_kill_house=kill_house,
+                            status='completed',
+                            trash=False)
+                    else:
                         slaughter_transactions = InternalTransaction.objects.filter(
                             Q(kill_house=kill_house) | Q(parent_kill_house=kill_house),
                             status='completed',
@@ -17528,6 +17534,12 @@ class MarketKillRequestViewSet(viewsets.ModelViewSet):
 
             kill_house_purchase = KillHousePurchaseRequest.objects.filter(kill_house=kill_house).first()
             total_unpaid_wage = get_finance_info(kill_house)['total_price']
+            if kill_house.killer and kill_house.type == 'public':
+
+                slaughter_transactions = InternalTransaction.objects.filter(
+                    kill_house=kill_house,parent_kill_house=kill_house, status='completed',
+                    trash=False)
+            else:
                 slaughter_transactions = InternalTransaction.objects.filter(
                     kill_house=kill_house, status='completed',
                     trash=False)