体验云存 兑换云存 添加消息

Controller/CloudStorage.py

@@ -34,7 +34,7 @@ from django.views.generic.base import View
 from pyfcm import FCMNotification
 
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
-    SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_ARN, APNS_MODE, APNS_CONFIG, BASE_DIR, JPUSH_CONFIG
+    SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_ARN, APNS_MODE, APNS_CONFIG, BASE_DIR, JPUSH_CONFIG, FCM_CONFIG
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket, StsCrdModel, \
     ExperienceContextModel, Pay_Type, CDKcontextModel, Device_User, SysMassModel, SysMsgModel, UidPushModel
 from Object.AliPayObject import AliPayObject
@@ -1124,7 +1124,7 @@ class CloudStorageView(View):
         pay_type = int(request_dict.get('pay_type', None))
         rank = request_dict.get('rank', None)
         cdk = request_dict.get('cdk', None)
-
+        lang = request_dict.get('lang', None)
         if cdk != None and pay_type == 11:
             cdk_qs = CDKcontextModel.objects.filter(cdk=cdk).values('is_activate', 'rank__id', 'rank__commodity_code')
             if not cdk_qs.exists():
@@ -1183,6 +1183,9 @@ class CloudStorageView(View):
 
         duq = Device_User.objects.filter(userID=userID).values('username')
         dvq = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
+
+
+
         if dvq.exists():
             dvq_set_update_dict = {
                 'vodPrimaryUserID': userID,
@@ -1190,6 +1193,7 @@ class CloudStorageView(View):
             }
             dvq.update(**dvq_set_update_dict)
 
+        sys_msg_text_list = ['成功购买云存', 'Successful purchase of cloud storage']
         # return response.json(0)
         returnurl = "{SERVER_DOMAIN}cloudstorage/payOK".format(SERVER_DOMAIN=SERVER_DOMAIN)
         if pay_type == 10:
@@ -1199,6 +1203,7 @@ class CloudStorageView(View):
                 do_time=nowTime
             )
             returnurl = "{SERVER_DOMAIN}cloudstorage/payOK?paytype=10".format(SERVER_DOMAIN=SERVER_DOMAIN)
+            sys_msg_text_list = ['成功体验云存', 'Successful experience of cloud storage']
 
         if pay_type == 11:
             update_dict = {}
@@ -1206,7 +1211,10 @@ class CloudStorageView(View):
             update_dict['order'] = orderID
             CDKcontextModel.objects.filter(cdk=cdk).update(**update_dict)
             returnurl = "{SERVER_DOMAIN}cloudstorage/payOK?paytype=11".format(SERVER_DOMAIN=SERVER_DOMAIN)
+            sys_msg_text_list = ['成功兑换云存', 'Successful exchange of cloud storage']
+
 
+        self.do_vod_msg_Notice(uid, channel, userID, lang, sys_msg_text_list)
         result = returnurl
         return response.json(0, result)
         # red_url =
@@ -1390,19 +1398,7 @@ class CloudStorageView(View):
             if tz is None or tz == '':
                 tz = 0
 
-            package_title_config = {
-                'com.ansjer.customizedd_a': 'DVS',
-                'com.ansjer.zccloud_a': 'ZosiSmart',
-                'com.ansjer.zccloud_ab': '周视',
-                'com.ansjer.adcloud_a': 'ADCloud',
-                'com.ansjer.adcloud_ab': 'ADCloud',
-                'com.ansjer.accloud_a': 'ACCloud',
-                'com.ansjer.loocamccloud_a': 'Loocam',
-                'com.ansjer.loocamdcloud_a': 'Anlapus',
-                'com.ansjer.customizedb_a': 'COCOONHD',
-                'com.ansjer.customizeda_a': 'Guardian365',
-                'com.ansjer.customizedc_a': 'PatrolSecure',
-            }
+            package_title_config = FCM_CONFIG[appBundleId]
             if appBundleId in package_title_config.keys():
                 msg_title = package_title_config[appBundleId] + '(' + nickname + ')'
             else:
@@ -1447,17 +1443,6 @@ class CloudStorageView(View):
 
             elif push_type == 1:  # android gcm
                 try:
-                    FCM_CONFIG = {
-                        'com.ansjer.zccloud_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
-                        'com.ansjer.loocamccloud_a': 'AAAAb9YP3rk:APA91bFCgd-kbVmpK4EVpfdHH_PJZQCYTkOGnTZdIuBWEz2r7aMRsJYHOH3sB-rwcbaRWgnufTyjX9nGQxb6KxQbWVk4ah_H-M3IqGh6Mb60WQQAuR33V6g_Jes5pGL6ViuIxGHqVMaR',
-                        'com.ansjer.loocamdcloud_a': 'AAAAb9YP3rk:APA91bGw2I2KMD4i-5T7nZO_wB8kuAOuqgyqe5rxmY-W5qkpYEx9IL2IfmC_qf6B_xOyjIDDSjckvMo-RauN__SEoxvAkis7042GRkoKpw7cjZ_H8lC-d50PC0GclPzccrOGFusyKbFY',
-                        'com.ansjer.customizedb_a': 'AAAAb9YP3rk:APA91bE7kI4vcm-9h_CJNFlOZfc-xwP4Btn6AnjOrwoKV6fgYN7fdarkO76sYxVZiAbDnxsFfOJyP7vQfwyan6mdjuyD5iHdt_XgO22VqniC0vA1V4GJiCS8Tp7LxIX8JVKZl9I_Powt',
-                        'com.ansjer.customizeda_a': 'AAAAb9YP3rk:APA91bF0HzizVWDc6dKzobY9fsaKDK4veqkOZehDXshVXs8pEEvNWjR_YWbhP60wsRYCHCal8fWN5cECVOWNMMzDsfU88Ty2AUl8S5FtZsmeDTkoGntQOswBr8Ln7Fm_LAp1VqTf9CpM',
-                        'com.ansjer.customizedd_a': 'AAAAb9YP3rk:APA91bHkxOozJWBrlv3eNT0PgwosYENI9aM4Zuzd418cX-iKkpa1zFNC5MkNDKApx1KH4fhmAfaJ6IMRZ0nj5GIxCpstDYCaZWwgC7-etqfSxG5JAq8LOwJx0o_1tUZqwjIic8ztsg0o',
-                        'com.ansjer.adcloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO',
-                        'com.ansjer.accloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO',
-                        'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
-                    }
                     serverKey = FCM_CONFIG[appBundleId]
                 except Exception as e:
                     return 'serverKey abnormal'