1.邮件提醒

ccs_base/models/order_state_change_rule.py

@@ -206,7 +206,7 @@ class OrderStateChangeRule(models.Model):
                         if redis_conn == 'no':
                             raise ValidationError('未连接redis')
                         else:
-                            if bl_obj.check_push_clear_customs_start():
+                            if bl_obj.check_push_clear_customs_start(utc_time.strftime("%Y-%m-%d %H:%M:%S")):
                                 redis_conn.lpush('mail_push_package_list', json.dumps(
                                     {'id': bl_obj.id, 'user_login': users_obj.login,
                                      'utc_time': utc_time.strftime("%Y-%m-%d %H:%M:%S")}))
@@ -215,12 +215,13 @@ class OrderStateChangeRule(models.Model):
             except Exception as err:
                 logging.error('fetch_mail_dlv_attachment--error:%s' % str(err))
         if mail_arr:
-            order_no_arr = [i.bl_no for i in mail_arr]
-            content = """
+            # order_no_arr = [i.bl_no for i in mail_arr]
+            order_no = ''.join([f"<p>{item.bl_no}</p>" for item in mail_arr])
+            content = f"""
                                     <p>您好：
-以下提单接收到清关邮件，但为触发清关结束或清关开始节点的变动，请查看原因，并手动处理</p>
-                                    <p>{0}</p>
-                                    <p>请立即处理，避免推送超时！</p>""".format('\n'.join(order_no_arr))
+以下提单接收到清关邮件，但未触发清关结束或清关开始节点的变动，请查看原因，并手动处理</p>
+                                    {order_no}
+                                    <p>请立即处理，避免推送超时！</p>"""
             # 给客户配置的每个邮箱都发送邮件
             patrol_sender_email = self.env["ir.config_parameter"].sudo().get_param('patrol_sender_email') or ''
             patrol_receiver_emails = self.env["ir.config_parameter"].sudo().get_param('patrol_receiver_emails') or ''