From a96f14d59dc4b942eb05ebd6ef6b66ef1135fe62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 5 Mar 2026 17:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E8=B4=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_salary/models/yuthon_meal_expenses.py       | 2 +-
 yuthon_salary/views/yuthon_meal_expenses_views.xml | 1 +
 yuthon_salary/wizard/party_meal_wizard.py          | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yuthon_salary/models/yuthon_meal_expenses.py b/yuthon_salary/models/yuthon_meal_expenses.py
index a82d17c9a..ddf3444aa 100644
--- a/yuthon_salary/models/yuthon_meal_expenses.py
+++ b/yuthon_salary/models/yuthon_meal_expenses.py
@@ -21,7 +21,7 @@ class YuthonMealExpenses(models.Model):
     select_year = fields.Selection(selection=[(str(i), str(i)) for i in range(2024, 2040)], string='年份',
                                    default=lambda self: str(datetime.now().year))
     meal_state = fields.Selection([('to_do', '待发送'), ('done', '已发送')], string='状态', default='to_do')
-    toll_state = fields.Selection([('to_do', '未缴'), ('done', '已缴')], string='状态', default='to_do')
+    toll_state = fields.Selection([('to_do', '待缴'), ('done', '已缴')], string='缴费状态', default='to_do')
 
 
     @api.depends('number_breakfasts', 'number_lunches')
diff --git a/yuthon_salary/views/yuthon_meal_expenses_views.xml b/yuthon_salary/views/yuthon_meal_expenses_views.xml
index 8c4bec6fa..5941e4d03 100644
--- a/yuthon_salary/views/yuthon_meal_expenses_views.xml
+++ b/yuthon_salary/views/yuthon_meal_expenses_views.xml
@@ -32,6 +32,7 @@
                 <field name="number_lunches"/>
                 <field name="total_payment"/>
                 <field name="company_id"/>
+                <field name="toll_state"/>
                 <field name="meal_state"/>
                 <button name="send_meal" string="发送" type="object" class="oe_highlight"/>
             </tree>
diff --git a/yuthon_salary/wizard/party_meal_wizard.py b/yuthon_salary/wizard/party_meal_wizard.py
index 3a1202608..d62efe088 100644
--- a/yuthon_salary/wizard/party_meal_wizard.py
+++ b/yuthon_salary/wizard/party_meal_wizard.py
@@ -48,7 +48,8 @@ class PartyMealWizard(models.TransientModel):
         employee_list = []
         meal_ids = self.env['yuthon.meal.expenses'].search([('select_time', '=', self.meal_month),
                                                             ('select_year', '=', self.meal_year),
-                                                            ('meal_state', '=', 'to_do')
+                                                            ('meal_state', '=', 'to_do'),
+                                                            ('toll_state', '=', 'to_do')
                                                             ])
         for meal_id in meal_ids:
             employee_list.append(meal_id.employee_id.id)
@@ -62,7 +63,8 @@ class PartyMealWizard(models.TransientModel):
             for employee in self.employee_ids:
                 meal = self.env['yuthon.meal.expenses'].search([('employee_id', '=', employee.id),
                                                                 ('select_time', '=', self.select_time),
-                                                                ('select_year', '=', self.select_year)])
+                                                                ('select_year', '=', self.select_year),
+                                                                ('toll_state', '=', 'to_do')])
                 self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
                                                                          user_id=employee.wecom_userid,
                                                                          title="缴纳餐费提醒",