Merge branch 'test' into 'master'

Like 2.4上线

See merge request !362

api/product.py

@@ -73,9 +73,9 @@ class ProductListView(APIView):
         sorted_condition = request.GET.get('sorted_condition', None)
 
         data = self.rpc['neptune/commodity/product/list'](
-            offset=offset, count=count, id_=id_, cn_name=cn_name, en_name=en_name, alias=alias, is_online=is_online, 
+            offset=offset, count=count, id_=id_, cn_name=cn_name, en_name=en_name, alias=alias, is_online=is_online,
             has_area=has_area, has_brand=has_brand, has_image=has_image, brand_id=brand_id, classify_id=classify_id,
-            category_id=category_id, price_low=price_low, price_high=price_high, grade_low=grade_low, grade_high=grade_high, 
+            category_id=category_id, price_low=price_low, price_high=price_high, grade_low=grade_low, grade_high=grade_high,
             comment_nums_low=comment_nums_low, comment_nums_high=comment_nums_high, effect_name=effect_name,
             sorted_condition=sorted_condition).unwrap()
 
@@ -90,11 +90,11 @@ class ProductListView(APIView):
             obj['brand_info'] = {
                 'id': brand_product_dict.get(str(product_id)).get('id'),
                 'cn_name': brand_product_dict.get(str(product_id)).get('cn_name')} if brand_product_dict.get(str(product_id)) else ''
-            obj['category_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')} 
+            obj['category_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')}
                                      for obj in category_product_dict.get(str(product_id))] if category_product_dict.get(str(product_id)) else []
-            obj['effect_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')} 
+            obj['effect_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')}
                                    for obj in effect_product_dict.get(str(product_id))] if effect_product_dict.get(str(product_id)) else []
-            obj['classify_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')} 
+            obj['classify_infos'] = [{'id': obj.get('id'), 'cn_name': obj.get('cn_name')}
                                      for obj in classify_product_dict.get(str(product_id))] if classify_product_dict.get(str(product_id)) else []
 
             obj.pop('norms')
@@ -102,7 +102,7 @@ class ProductListView(APIView):
             obj.pop('platform')
 
         count = self.rpc['neptune/commodity/product/count'](
-            id_=id_, cn_name=cn_name, en_name=en_name, alias=alias, is_online=is_online, has_area=has_area, has_brand=has_brand, 
+            id_=id_, cn_name=cn_name, en_name=en_name, alias=alias, is_online=is_online, has_area=has_area, has_brand=has_brand,
             has_image=has_image, brand_id=brand_id, category_id=category_id, classify_id=classify_id, price_low=price_low,
             price_high=price_high, grade_low=grade_low, grade_high=grade_high, comment_nums_low=comment_nums_low,
             comment_nums_high=comment_nums_high, effect_name=effect_name).unwrap()
@@ -163,6 +163,7 @@ class ProductCreateView(APIView):
         effect_ids = json.loads(request.POST.get('effect_ids', '[]'))
         is_online = request.POST.get('is_online')
         brand_id = request.POST.get('brand_id')
+        period_of_use = request.POST.get('period_of_use')
 
         if not cn_name or not image:
             return r'缺少参数'
@@ -170,13 +171,15 @@ class ProductCreateView(APIView):
         data = self.rpc['neptune/commodity/product/create'](
             cn_name=cn_name, en_name=en_name, alias=alias, image=image, norms=norms, grade=grade, price=price,
             country=country, description=description, comment_nums=comment_nums, classify_ids=classify_ids,
-            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id).unwrap()
+            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id,
+            period_of_use=period_of_use
+        ).unwrap()
 
         return data
 
 
 class ProductUpdateView(APIView):
-    
+
     def post(self, request):
         id_ = request.POST.get('id')
         cn_name = request.POST.get('cn_name', None)
@@ -194,6 +197,7 @@ class ProductUpdateView(APIView):
         effect_ids = json.loads(request.POST.get('effect_ids', '[]'))
         is_online = request.POST.get('is_online')
         brand_id = request.POST.get('brand_id')
+        period_of_use = request.POST.get('period_of_use', 0)
 
         if not id_:
             return r'缺少参数'
@@ -201,7 +205,8 @@ class ProductUpdateView(APIView):
         data = self.rpc['neptune/commodity/product/update'](
             id_=id_, cn_name=cn_name, en_name=en_name, alias=alias, image=image, norms=norms, grade=grade, price=price,
             country=country, description=description, comment_nums=comment_nums, classify_ids=classify_ids,
-            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id).unwrap()
+            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id,
+            period_of_use=period_of_use).unwrap()
 
         return data
 

api/reply.py

@@ -99,17 +99,24 @@ class ReplyManageListView(APIView):
         to_create_time = request.GET.get('to_create_time', None)
         from_topic_create_time = request.GET.get('from_topic_create_time', None)
         to_topic_create_time = request.GET.get('to_topic_create_time', None)
+        user_kol = request.GET.get('user_kol', None)
+        user_shadow = request.GET.get('user_shadow', None)
+        user_edit = request.GET.get('user_edit', None)
+        replied_user_kol = request.GET.get('replied_user_kol', None)
+        replied_user_shadow = request.GET.get('replied_user_shadow', None)
+        replied_user_edit = request.GET.get('replied_user_edit', None)
+
 
         other_filters = {}
         if topic_content:
             other_filters['topic_content'] = topic_content.strip()
         if reply_user_type:
             reply_user_type = int(reply_user_type)
-            if reply_user_type in [USER_EXTRA_TYPE.REAL, USER_EXTRA_TYPE.SHADOW, USER_EXTRA_TYPE.KOL]:
+            if reply_user_type is not None:
                 other_filters['reply_user_type'] = reply_user_type
         if replied_user_type:
             replied_user_type = int(replied_user_type)
-            if replied_user_type in [USER_EXTRA_TYPE.REAL, USER_EXTRA_TYPE.SHADOW, USER_EXTRA_TYPE.KOL]:
+            if replied_user_type is not None:
                 other_filters['replied_user_type'] = replied_user_type
         if from_topic_create_time and to_topic_create_time:
             other_filters['topic_create_time__gte'] = from_topic_create_time
@@ -137,6 +144,24 @@ class ReplyManageListView(APIView):
             filters['create_time__gte'] = from_create_time
             filters['create_time__lte'] = to_create_time
 
+        if user_kol is not None:
+            filters['user_kol'] = int(user_kol)
+
+        if user_shadow is not None:
+            filters['user_shadow'] = int(user_shadow)
+
+        if user_edit is not None:
+            filters['user_edit'] = int(user_edit)
+
+        if replied_user_edit is not None:
+            filters['replied_user_edit'] = int(replied_user_edit)
+
+        if replied_user_kol is not None:
+            filters['replied_user_kol'] = int(replied_user_kol)
+
+        if replied_user_shadow is not None:
+            filters['replied_user_shadow'] = int(replied_user_shadow)
+
         try:
             data = self.rpc['venus/sun/reply/manage/list'](offset=(page-1) * limit, limit=limit, filters=filters, other_filters=other_filters).unwrap()
         except Exception as e:

api/survey.py

+import json
+from utils.base import APIView, get_offset_count
+
+
+class SurveyListView(APIView):
+
+    def get(self, request):
+
+        offset, count = get_offset_count(request)
+
+        data = self.rpc['venus/sun/survey/list'](offset=offset, count=count).unwrap()
+
+        return data
+
+
+class SurveyView(APIView):
+
+    def get(self, request):
+        id_ = int(request.GET.get('template_id'))
+
+        data = self.rpc['venus/sun/survey/get'](id_=id_).unwrap()
+        return data
+
+    def post(self, request):
+
+        questions = json.loads(request.POST.get('questions'))
+
+        data = {
+            "name": request.POST.get('name', ""),
+            "questions": questions,
+            "template_id": int(request.POST.get('template_id', 0)),
+        }
+
+        self.rpc['venus/sun/survey/add'](data=data).unwrap()
+
+        return {
+            "status": 1
+        }
+
+

api/tag.py

@@ -60,7 +60,7 @@ class TagUpdateOrCreateView(APIView):
             official_pictorial_id = official_pictorial_id[0]
         else:
             official_pictorial_id = None
-
+        is_expert = int(request.POST.get('is_expert', 0))
         data = {
             'name': request.POST.get('name').lower(),
             'description': request.POST.get('description', ''),
@@ -74,6 +74,9 @@ class TagUpdateOrCreateView(APIView):
             'is_core': request.POST.get('is_core', 0),
             'official_pictorial_id': official_pictorial_id,
             'is_show_in_register': request.POST.get('is_show_in_register', 'false'),
+            'is_expert': request.POST.get('is_expert', 0),
+            'gray_badge': request.POST.get('gray_badge', '') if is_expert else "",
+            'light_badge': request.POST.get('light_badge', '') if is_expert else "",
             'pictorial_ids': list(
                 (map(lambda x: int(x.split(":")[0]), json.loads((request.POST.get('pictorial_ids', '[]'))))))
         }

api/topic.py

@@ -6,10 +6,12 @@
 import json
 from utils.base import APIView, get_offset_count
 from utils.logger import error_logger
+from alpha_types.venus import USER_EXTRA_TYPE
 
 
 class TopicListView(APIView):
     def get(self, request):
+
         pictorial_id = request.GET.get('pictorial_id', '')
         user_id = request.GET.get('user_id', '')
         page = int(request.GET.get('page', 1))
@@ -31,6 +33,18 @@ class TopicListView(APIView):
         if filters.get("is_finished") is not None:
             filters["is_finished"] = True if filters.get("is_finished") else False
 
+        user_type = filters.pop("user_type") if filters.get("user_type") else None
+
+        if user_type:
+            if int(user_type) == USER_EXTRA_TYPE.COMMON:
+                filters["is_shadow"] = 0
+            elif int(user_type) == USER_EXTRA_TYPE.SHADOW:
+                filters["is_shadow"] = 1
+            elif int(user_type) == USER_EXTRA_TYPE.KOL:
+                filters["is_kol"] = 1
+            elif int(user_type) == USER_EXTRA_TYPE.EDIT:
+                filters["is_edit"] = 1
+
         res = self.rpc['physical/search/business/topic'](
             offset=(page-1) * limit,
             size=limit,
@@ -147,6 +161,7 @@ class TopicUpdateOrCreateView(APIView):
             'is_recommend': int(request.POST.get('is_recommend', 0)),
             'body_esthetics_tag_ids': body_esthetics_tag_ids,
             'product_id': request.POST.get('product_id'),
+            'product_recommend': int(request.POST.get('product_recommend', 0)),
             'have_face': int(request.POST.get('have_face', 0)),
             'is_finished': int(request.POST.get('is_finished', 1)),
         }

api/urls.py

@@ -33,6 +33,7 @@ from .classify import *
 from .effect import *
 from .skin_check import *
 from .reply import *
+from .survey import *
 
 
 urlpatterns = [
@@ -244,6 +245,12 @@ urlpatterns = [
     # 测肤
     url(r'^skin_check/pictorial$', SkinCheckPictorial.as_view()),
     url(r'^skin_check/config$', SkinCheckConfig.as_view()),
+
+
+    # 调查问卷
+    url(r'^survey_question/create$', SurveyView.as_view()),
+    url(r'^survey_question/get$', SurveyView.as_view()),
+    url(r'^survey_question/list$', SurveyListView.as_view()),
 ]
 
 search_urlpatterns = [