Merge branch 'haow/dev' into 'test'

fix code

See merge request alpha/sun!264

api/product.py

@@ -160,6 +160,7 @@ class ProductCreateView(APIView):
         category_ids = json.loads(request.POST.get('category_ids', '[]'))
         effect_ids = json.loads(request.POST.get('effect_ids', '[]'))
         is_online = request.POST.get('is_online')
+        brand_id = request.POST.get('brand_id')
 
         if not cn_name or not image:
             return r'缺少参数'
@@ -167,7 +168,7 @@ 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).unwrap()
+            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id).unwrap()
 
         return data
 
@@ -190,6 +191,7 @@ class ProductUpdateView(APIView):
         category_ids = json.loads(request.POST.get('category_ids', '[]'))
         effect_ids = json.loads(request.POST.get('effect_ids', '[]'))
         is_online = request.POST.get('is_online')
+        brand_id = request.POST.get('brand_id')
 
         if not id_:
             return r'缺少参数'
@@ -197,6 +199,6 @@ 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).unwrap()
+            category_ids=category_ids, effect_ids=effect_ids, is_online=is_online, brand_id=brand_id).unwrap()
 
         return data