diff --git a/yuthon_catering/controllers/restaurant.py b/yuthon_catering/controllers/restaurant.py index 455c6b39b..9fb187856 100644 --- a/yuthon_catering/controllers/restaurant.py +++ b/yuthon_catering/controllers/restaurant.py @@ -47,10 +47,8 @@ class RestaurantController(Controller): @exception_handle def collect_catering(self, **kwargs): user_id = int(kwargs.get('user_id')) - employee = request.env['hr.employee'].sudo().search([('id', '=', user_id)]) - _logger.info(f'---当前获取数据--{user_id}---') - _logger.info(f'---当前获取数据--{employee.id}---{employee.name}') menu_date = kwargs.get('menu_date', date.today()) + employee = request.env['hr.employee'].sudo().search([('user_id', '=', user_id)]) existing_record = request.env['yuthon.catering'].search([ ('date', '=', menu_date), ('employee_id', '=', employee.id) @@ -78,16 +76,11 @@ class RestaurantController(Controller): @route('/phone/restaurant/update_catering', methods=['POST'], type='http', auth="none", csrf=False, cors='*') @exception_handle def update_catering(self, **kwargs): - # user_id = int(kwargs.get('user_id')) - # catering_id = int(kwargs.get('id')) - # user = request.env['res.users'].sudo().browse(user_id).exists() - # employee = request.env['hr.employee'].sudo().search([('user_id', '=', user_id)]) - # catering = request.env['yuthon.catering'].with_user(user).browse(catering_id).exists() - user_id = int(kwargs.get('user_id')) - employee = request.env['hr.employee'].sudo().search([('id', '=', user_id)]) - catering = request.env['yuthon.catering'].search([('id', '=', int(kwargs.get('id')))]) - + catering_id = int(kwargs.get('id')) + user = request.env['res.users'].sudo().browse(user_id).exists() + employee = request.env['hr.employee'].sudo().search([('user_id', '=', user_id)]) + catering = request.env['yuthon.catering'].with_user(user).browse(catering_id).exists() if not catering: return json.dumps({'data': '', 'code': 500, 'message': '修改失败,记录不存在'}) catering.write({ @@ -118,7 +111,7 @@ class RestaurantController(Controller): if not user_id or not menu_date or not menu_id: return json.dumps({'data': '', 'code': 500, 'message': '请求失败'}) - employee = request.env['hr.employee'].sudo().search([('id', '=', user_id)]) + employee = request.env['hr.employee'].sudo().search([('user_id', '=', user_id)]) catering = request.env['yuthon.catering'].sudo().search([ ('employee_id', '=', employee.id), ('date', '=', menu_date), diff --git a/yuthon_catering/models/yuthon_catering.py b/yuthon_catering/models/yuthon_catering.py index bed3ff310..e21226ee7 100644 --- a/yuthon_catering/models/yuthon_catering.py +++ b/yuthon_catering/models/yuthon_catering.py @@ -47,7 +47,7 @@ class YuthonCatering(models.Model): def task_catering(self): employee_ids = self.env['yuthon.catering.conf'].search([])[0].employee_ids for emp in employee_ids: - url = f"https://phone.thtzjt.com/phone/Restaurant/{emp.id}" + url = f"https://phone.thtzjt.com/phone/Restaurant/{emp.user_id.id}" self.sudo().env["wecom.apps"].sync_send_message_textcard( category='can', user_id=emp.wecom_userid,