把云存过期提醒提交到正式

Controller/CloudStorage.py

@@ -1470,12 +1470,12 @@ 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')
+        # 过期前第7天提示一次
+        list = UID_Bucket.objects.filter(Q(endTime__gt=now_time + 3600 * 144) & Q(endTime__lte=(now_time + 3600 * 168))).values('id','uid','bucket__area','channel','endTime')
         self.do_vod_msg(now_time,list)
 
-        # 前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')
+        # 过期前第3天提示一次
+        list = UID_Bucket.objects.filter(Q(endTime__gt=now_time + 3600 * 48) & Q(endTime__lte=(now_time + 3600 * 72))).values('id','uid','bucket__area','channel','endTime')
         self.do_vod_msg(now_time,list)
         return response.json(0)
 
@@ -1491,12 +1491,10 @@ class CloudStorageView(View):
             for oo in oqlist:
                 if ub['id'] == oo['uid_bucket_id']:
                     if ub['bucket__area'] == 'cn':
-                        sys_msg_text = "尊重的客户，您" + ub['uid'] + "设备的云存套餐将在" + time.strftime("%Y-%m-%d",
-                                                                                           ub['endTime']) + "到期，特此通知。"
+                        sys_msg_text = "尊重的客户，您" + ub['uid'] + "设备的云存套餐将在" + time.strftime("%Y-%m-%d", time.localtime(ub['endTime'])) + "到期，特此通知。"
                     else:
                         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."
+                            'uid'] + " device will expire in " + time.strftime("%Y-%m-%d", time.localtime(ub['endTime'])) + ", hereby notified."
                     uq_list.append(SysMsgModel(
                         userID_id=oo['userID_id'],
                         addTime=now_time,
@@ -1506,6 +1504,7 @@ class CloudStorageView(View):
                         msg=sys_msg_text,
                         status=0
                     ))
+                    SysMsgModel.objects.bulk_create(uq_list)
                     user_qs = Device_User.objects.filter(userID=oo['userID_id'])
                     if user_qs.exists():
                         user = user_qs[0]
@@ -1522,7 +1521,6 @@ class CloudStorageView(View):
 
                         self.pushApp(now_time, ub['uid'], ub['channel'], sys_msg_text)
 
-        SysMsgModel.objects.bulk_create(uq_list)
 
 
     def pushApp(self, nowTime, uid, channel, sys_msg_text):