修复发送云存系统消息错误2

Controller/CloudStorage.py

@@ -909,7 +909,7 @@ class CloudStorageView(View):
                     device_name = CommonService.query_serial_with_uid(uid=UID)
 
                     sys_msg_text_list = ['温馨提示：尊敬的客户，您的'+device_name+'设备在'+datetime+'已成功购买云存套餐', 'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on '+ time.strftime("%b %dth,%Y", time.localtime())]
-                    self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485', device_name)
+                    self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
                     red_url = "{SERVER_DOMAIN_SSL}web/paid2/success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
                     if lang != 'cn':
                         red_url = "{SERVER_DOMAIN_SSL}web/paid2/en_success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -1059,7 +1059,7 @@ class CloudStorageView(View):
                                      'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                          "%b %dth,%Y", time.localtime())]
 
-                self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485', device_name)
+                self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
 
                 # return response.json(0)
                 red_url = "{SERVER_DOMAIN_SSL}web/paid2/success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -1188,7 +1188,7 @@ class CloudStorageView(View):
                     sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功购买云存套餐',
                                          'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                              "%b %dth,%Y", time.localtime())]
-                    self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485', device_name)
+                    self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
                     redisObj.del_data(key=orderID + 'do_notify')
                     return HttpResponse("<xml>\
                       <return_code><![CDATA[SUCCESS]]></return_code>\
@@ -1558,7 +1558,7 @@ class CloudStorageView(View):
                                          'Dear customer, you already redeemed for the cloud storage package successfully for device ' +device_name +' on '+time.strftime("%b %dth,%Y", time.localtime())]
                     sms = 'SMS_219748439'
 
-                self.do_vod_msg_Notice(uid, channel, userID, lang, sys_msg_text_list, sms, device_name)
+                self.do_vod_msg_Notice(uid, channel, userID, lang, sys_msg_text_list, sms)
                 result = returnurl
                 redisObj.del_data(key=uid+'do_experience_order')
                 return response.json(0, result)
@@ -1741,7 +1741,7 @@ class CloudStorageView(View):
             return response.json(500, repr(e))
 
     # 云存操作系统消息
-    def do_vod_msg_Notice(self, uid, channel, userID, lang, sys_msg_text_list, sms, device_name):
+    def do_vod_msg_Notice(self, uid, channel, userID, lang, sys_msg_text_list, sms):
         try:
             logger = logging.getLogger('log')
             logger.info('进来了')
@@ -1764,8 +1764,9 @@ class CloudStorageView(View):
                 if data_valid.email_validate(username):
                     S3Email().faEmail(sys_msg_text, username)
                 elif data_valid.mobile_validate(username):
-                    device_id = device_name if device_name else uid
-                    params = u'{"devname":"' + device_id + '","submittime":"' + time.strftime("%Y-%m-%d",time.localtime()) + '"}'
+                    # 如果存在序列号,消息提示用序列号
+                    device_name = CommonService.query_serial_with_uid(uid=uid)
+                    params = u'{"devname":"' + device_name + '","submittime":"' + time.strftime("%Y-%m-%d",time.localtime()) + '"}'
                     self.sendMessage(username, params, sms)
 
                 self.pushApp(nowTime, uid, channel, sys_msg_text)
@@ -1827,8 +1828,7 @@ class CloudStorageView(View):
                         if data_valid.email_validate(username):
                             S3Email().faEmail(sys_msg_text, username)
                         elif data_valid.mobile_validate(username):
-                            device_id = device_name if device_name else ub['uid']
-                            params = u'{"devname":"' + device_id + '","submittime":"' + time.strftime("%Y-%m-%d",
+                            params = u'{"devname":"' + device_name + '","submittime":"' + time.strftime("%Y-%m-%d",
                                                                                                       time.localtime(ub['endTime'])) + '"}'
                             self.sendMessage(username, params, 'SMS_219748440')
 

Controller/PaymentCycle.py

@@ -259,13 +259,13 @@ class PaypalCycleNotify(View):
 
                 order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id,
                                 promotion_rule_id=promotion_rule_id,agreement_id=agreement_id)
-                datetime = time.strftime("%Y-%m-%d", time.localtime())
-                sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + UID + '设备在' + datetime + '已成功订阅云存套餐',
-                                     'Dear customer,you already subscribed the cloud storage package successfully for device ' + UID + ' on ' + time.strftime(
-                                         "%b %dth,%Y", time.localtime())]
                 # 如果存在序列号,消息提示用序列号
                 device_name = CommonService.query_serial_with_uid(uid=UID)
-                CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485', device_name)
+                datetime = time.strftime("%Y-%m-%d", time.localtime())
+                sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功订阅云存套餐',
+                                     'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
+                                         "%b %dth,%Y", time.localtime())]
+                CloudStorage.CloudStorageView.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
 
                 # return response.json(0)
                 red_url = "{SERVER_DOMAIN_SSL}web/paid2/success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -428,19 +428,19 @@ class PaypalCycleNotify(View):
                                                    commodity_type=order_list[0]['commodity_type'],rank_id=rank, paymentID='',
                                                    coupon_id='',uid_bucket_id=uid_bucket_id,status=1,agreement_id=agreement_id,
                                                    plan_id=order_list[0]['plan_id'], ai_rank_id=1, trade_no=paypal_transaction_id)
+                        # 如果存在序列号,消息提示用序列号
+                        device_name = CommonService.query_serial_with_uid(uid=UID)
                         datetime = time.strftime("%Y-%m-%d", time.localtime())
-                        sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + UID + '设备在' + datetime + '已成功续订云存套餐',
-                                             'Dear customer,you already subscribed the cloud storage package successfully for device ' + UID + ' on ' + time.strftime(
+                        sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功续订云存套餐',
+                                             'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                                  "%b %dth,%Y", time.localtime())]
 
                         if order_list[0]['payType'] == 1:
                             lang = 'en'
                         else:
                             lang = 'cn'
-                        # 如果存在序列号,消息提示用序列号
-                        device_name = CommonService.query_serial_with_uid(uid=UID)
-                        CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang,
-                                                                        sys_msg_text_list, 'SMS_219738485',device_name)
+                        CloudStorage.CloudStorageView.do_vod_msg_Notice(UID, channel, userid, lang,
+                                                                        sys_msg_text_list, 'SMS_219738485')
                         logger.info('-----------------------result')
                         logger.info('success')
 
@@ -599,19 +599,19 @@ class PaypalCycleNotify(View):
                                                    pay_url='', isSelectDiscounts=0,
                                                    commodity_code=order_list[0]['commodity_code'], commodity_type=order_list[0]['commodity_type'],
                                                    rank_id=rank, paymentID='', coupon_id='',uid_bucket_id=uid_bucket_id,status=1,agreement_id=agreement_id,plan_id=order_list[0]['plan_id'])
+                        # 如果存在序列号,消息提示用序列号
+                        device_name = CommonService.query_serial_with_uid(uid=UID)
                         datetime = time.strftime("%Y-%m-%d", time.localtime())
-                        sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + UID + '设备在' + datetime + '已成功续订云存套餐',
-                                             'Dear customer,you already subscribed the cloud storage package successfully for device ' + UID + ' on ' + time.strftime(
+                        sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功续订云存套餐',
+                                             'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                                  "%b %dth,%Y", time.localtime())]
 
                         if order_list[0]['payType'] == 1:
                             lang = 'en'
                         else:
                             lang = 'cn'
-                        # 如果存在序列号,消息提示用序列号
-                        device_name = CommonService.query_serial_with_uid(uid=UID)
-                        CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang,
-                                                                        sys_msg_text_list, 'SMS_219738485', device_name)
+                        CloudStorage.CloudStorageView.do_vod_msg_Notice(UID, channel, userid, lang,
+                                                                        sys_msg_text_list, 'SMS_219738485')
                         return HttpResponse('success')
                 except Exception as e:
                     print(e)