更新后台代码

AdminController/ServeManagementController.py

@@ -322,6 +322,7 @@ class serveManagement(View):
                 'is_show',
                 'is_ai',
                 'pixel_level',
+                'product_id',
                 'add_time',
                 'update_time')
             total = len(store_meal_val)
@@ -350,6 +351,7 @@ class serveManagement(View):
                     'is_show': store_meal['is_show'],
                     'is_ai': store_meal['is_ai'],
                     'pixel_level': store_meal['pixel_level'],
+                    'product_id': store_meal['product_id'],
                     'addTime': store_meal['add_time'].strftime("%Y-%m-%d %H:%M:%S"),
                     'updTime': store_meal['update_time'].strftime("%Y-%m-%d %H:%M:%S"),
                 })
@@ -381,6 +383,7 @@ class serveManagement(View):
         is_show = int(request_dict.get('is_show', 0))
         is_ai = int(request_dict.get('is_ai', 0))
         pixel_level = int(request_dict.get('pixel_level', 0))
+        product_id = request_dict.get('product_id', '')
         isEdit = request_dict.get('isEdit', None)
 
         if not all([bucket, pay_type, price, currency, symbol]):
@@ -404,6 +407,7 @@ class serveManagement(View):
                 'is_show': is_show,
                 'is_ai': is_ai,
                 'pixel_level': pixel_level,
+                'product_id': product_id
             }
             if isEdit:
                 if not storeMealID:
@@ -458,10 +462,10 @@ class serveManagement(View):
                 'lang__title',
                 'lang__content',
                 'lang__discount_content',
+                'lang__new_title'
             )
             total = len(store_meal_lang_val)
-            store_meal_langs = store_meal_lang_val[(
-                                                           page - 1) * line:page * line]
+            store_meal_langs = store_meal_lang_val[(page - 1) * line:page * line]
             store_meal_lang_list = []
             for store_meal_lang in store_meal_langs:
                 store_meal_lang_list.append({
@@ -471,6 +475,7 @@ class serveManagement(View):
                     'title': store_meal_lang['lang__title'],
                     'content': store_meal_lang['lang__content'],
                     'discountContent': store_meal_lang['lang__discount_content'],
+                    'new_title': str(store_meal_lang['lang__new_title']),
                 })
             print('store_meal_lang_list: ', store_meal_lang_list)
             return response.json(
@@ -487,12 +492,15 @@ class serveManagement(View):
         title = request_dict.get('title', None)
         content = request_dict.get('content', None)
         discount_content = request_dict.get('discount_content', '')
+        new_title = request_dict.get('new_title', '')
         isEdit = request_dict.get('isEdit', None)
 
         if not all([storeMealID, lang, title, content]):
             return response.json(444)
 
         try:
+            if new_title != '':
+                new_title = eval(new_title)
             # 查询套餐是否存在
             store_meal_qs = Store_Meal.objects.get(id=storeMealID)
             if not store_meal_qs:
@@ -506,25 +514,33 @@ class serveManagement(View):
                     lang=lang,
                     title=title,
                     content=content,
-                    discount_content=discount_content)
+                    discount_content=discount_content,
+                    new_title=new_title
+                )
             else:  # 添加
                 lang_obj = Lang.objects.filter(
                     lang=lang,
                     title=title,
                     content=content,
-                    discount_content=discount_content)
+                    discount_content=discount_content,
+                    new_title=new_title
+                )
                 if not lang_obj.exists():
                     # 数据不存在,lang表创建数据
                     Lang.objects.create(
                         lang=lang,
                         title=title,
                         content=content,
-                        discount_content=discount_content)
+                        discount_content=discount_content,
+                        new_title=new_title
+                    )
                     lang_obj = Lang.objects.filter(
                         lang=lang,
                         title=title,
                         content=content,
-                        discount_content=discount_content)
+                        discount_content=discount_content,
+                        new_title=new_title
+                    )
                 store_meal_qs.lang.add(*lang_obj)  # store_meal表添加语言数据
             return response.json(0)
         except Exception as e:

AdminController/UserManageController.py

@@ -330,6 +330,7 @@ class UserManagement(View):
         @return:
         """
         print('request_dict: ', request_dict)
+        user_id = request_dict.get('userId', '').strip()
         username = request_dict.get('username', '').strip()  # 移除字符串头尾的空格
         NickName = request_dict.get('NickName', '').strip()
         phone = request_dict.get('phone', '').strip()
@@ -347,6 +348,8 @@ class UserManagement(View):
         try:
             device_user_qs = Device_User.objects.all()
             # 条件查询
+            if user_id:
+                device_user_qs = device_user_qs.filter(userID=user_id)
             if username:
                 device_user_qs = device_user_qs.filter(username__icontains=username)
             if NickName: