Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/销售和排程添加消息推送

sf_message/models/sf_message_sale.py

@@ -27,6 +27,7 @@ class SFMessageSale(models.Model):
 
     # 继承并重写jikimo.message.dispatch的_get_message()
     def _get_message(self, message_queue_ids):
+        res = super(SFMessageSale, self)._get_message(message_queue_ids)
         if message_queue_ids.message_template_id.bussiness_node_id.name == '确认接单':
             # sale_order = self.env['sale.order'].search([('id', '=', message_queue_ids.model.res_id)])
             sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(message_queue_ids.res_id))])
@@ -34,10 +35,5 @@ class SFMessageSale(models.Model):
                 product = sale_order_line[0].product_id.name
             elif len(sale_order_line) > 1:
                 product = '%s...' % sale_order_line[0].product_id.name
-        res = super(SFMessageSale, self)._get_message(message_queue_ids)
-        if res:
-            try:
-                res.add_queue('待排程')
-            except Exception as e:
-                logging.info('_get_message error:%s' % e)
+            res[0] = res[0].replace('{{product_id}}', product)
         return res