Merge branch 'haow/dev' into 'test'

fix branch batch create api

See merge request alpha/saturn!65

api/views/product.py

@@ -91,10 +91,20 @@ class ProductBatchCreate(BaseView):
 class BrandBatchCreate(BaseView):
     '''批量创建品牌'''
     def post(self, request):
-        brand_infos = request.POST.get('data')
+        brand_infos = json.loads(request.POST.get('data', '[]'))
         if not brand_infos:
             return self.error(self.get_ErrorInfo(ERROR.PARAMS_INCOMPLETE))
-        error, ret = self.call_rpc('neptune/commodity/brand/batch_create', 
-                                   infos=brand_infos, platform=PRODUCT_FLATFORM.BEVOL)
-        return error, ret
+        infos = [{
+            'id': item.get('brandId'),
+            'cn_name': item.get('displayName'),
+            'en_name': item.get('aliasName'),
+            'icon': item.get('imgPath'),
+            'description': item.get('description')
+            } for item in brand_infos]
+        error, _ = self.call_rpc('neptune/commodity/brand/batch_create', 
+                                   infos=infos, platform=PRODUCT_FLATFORM.BEVOL)
+        if error:
+            return self.error(error)
+
+        return self.ok()