云存过期 短信及邮件提醒3

Controller/CloudStorage.py

@@ -1475,11 +1475,16 @@ class CloudStorageView(View):
     def do_vod_msg_end(self, request_dict):
         response = ResponseObject()
         now_time = int(time.time())
+        # 前7天提示一次
+        list = UID_Bucket.objects.filter(Q(endTime__lte=(now_time - 3600 * 168)) & Q(endTime__gt=now_time - 3600 * 72)).values('id','uid','bucket__area','channel','endTime')
+        self.do_vod_msg(now_time,list)
 
-        list = UID_Bucket.objects.filter(Q(endTime__lte=(now_time - 3600 * 72)) & Q(endTime__gt=now_time)).values('id',
-                                                                                                                  'uid',
-                                                                                                                  'bucket__area','channel')
+        # 前3天提示一次
+        list = UID_Bucket.objects.filter(Q(endTime__lte=(now_time - 3600 * 72)) & Q(endTime__gt=now_time)).values('id','uid','bucket__area','channel','endTime')
+        self.do_vod_msg(now_time,list)
+        return response.json(0)
 
+    def do_vod_msg(self, now_time, list):
         uq_list = []
         ids = []
         for ub in list:
@@ -1491,9 +1496,12 @@ class CloudStorageView(View):
             for oo in oqlist:
                 if ub['id'] == oo['uid_bucket_id']:
                     if ub['bucket__area'] == 'cn':
-                        sys_msg_text = "云存即将过期，请您注意！"
+                        sys_msg_text = "尊重的客户，您" + ub['uid'] + "设备的云存套餐将在" + time.strftime("%Y-%m-%d",
+                                                                                           ub['endTime']) + "到期，特此通知。"
                     else:
-                        sys_msg_text = "Cloud storage is about to expire, please pay attention!"
+                        sys_msg_text = "Dear customer, the cloud storage package of your " + ub[
+                            'uid'] + " device will expire in " + time.strftime("%Y-%m-%d",
+                                                                               ub['endTime']) + ", hereby notified."
                     uq_list.append(SysMsgModel(
                         userID_id=oo['userID_id'],
                         addTime=now_time,
@@ -1513,7 +1521,8 @@ class CloudStorageView(View):
                             S3Email.faEmail(sys_msg_text, username)
                         elif data_valid.mobile_validate(username):
                             params = u'{"devname":"' + ub['uid'] + '","submittime":"' + time.strftime("%Y-%m-%d",
-                                                                                                time.localtime()) + '"}'
+                                                                                                      ub[
+                                                                                                          'endTime']) + '"}'
                             self.sendMessage(username, params, 'SMS_217425550')
 
                         self.pushApp(now_time, ub['uid'], ub['channel'], sys_msg_text)
@@ -1521,8 +1530,6 @@ class CloudStorageView(View):
         SysMsgModel.objects.bulk_create(uq_list)
 
 
-        return response.json(0)
-
     def pushApp(self, nowTime, uid, channel, sys_msg_text):
         n_time = nowTime