Merge branch 'haow/dev' into 'test'

fix code

See merge request alpha/sun!262

api/product.py

@@ -69,12 +69,13 @@ class ProductListView(APIView):
         grade_high = request.GET.get('grade_high', None)
         comment_nums_low = request.GET.get('comment_nums_low', None)
         comment_nums_high = request.GET.get('comment_nums_high', None)
+        effect_name = request.GET.get('effect_name', 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, 
             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, 
-            comment_nums_low=comment_nums_low, comment_nums_high=comment_nums_high).unwrap()
+            comment_nums_low=comment_nums_low, comment_nums_high=comment_nums_high, effect_name=effect_name).unwrap()
 
         product_ids = [obj.get('id') for obj in data]
         brand_product_dict = self.get_brand_infos(product_ids)
@@ -100,8 +101,9 @@ class ProductListView(APIView):
 
         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, 
-            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).unwrap()
+            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()
         result = {
             'list': data,
             'total': count,