brand中加入yohobrandid字段

@@ -18,6 +18,13 @@
             "id": {
                 "type": "long"
             },
+            "yohoBrandId": {
+                "type": "long"
+            },
+            "isGlobal": {
+              "type": "string",
+              "index":    "not_analyzed"
+            },
             "status": {
                 "type": "integer"
             },
@@ -76,7 +83,7 @@
                     }
                 },
                 "type": "multi_field"
-                
+
             },
             "brandNameEn": {
                 "type": "string",

@@ -48,12 +48,13 @@ public class TblBrandLogicService {
             //如果全球购和有货之间存在映射
             if(tblBrandRelationMap.containsKey(tblBrand.getBrandId())){
                 TblBrandRelation tblBrandRelation = tblBrandRelationMap.get(tblBrand.getBrandId());
-                brand.setId(tblBrandRelation.getYohoBrandId());
+                brand.setId(tblBrandRelation.getTblBrandId()*(-1));
                 String brandAlif = tblBrandRelation.getYohoBrandNameEn().substring(0,1).toUpperCase();
                 brand.setBrandAlif(brandAlif);
                 brand.setBrandName(tblBrandRelation.getYohoBrandNameEn());
                 brand.setBrandNameEn(tblBrandRelation.getYohoBrandNameEn());
                 brand.setBrandNameCn(tblBrandRelation.getYohoBrandNameCn());
+                brand.setYohoBrandId(tblBrandRelation.getYohoBrandId());
             }else{
                 brand.setId(tblBrand.getBrandId()*(-1));
                 String brandAlif = tblBrand.getBrandNameEn().substring(0,1).toUpperCase();
@@ -72,6 +73,7 @@ public class TblBrandLogicService {
             }else{
                 brand.setStatus(1);
             }
+            brand.setIsGlobal("Y");
             brand.setBrandIco(tblBrand.getLogo());
             brand.setBrandDomain(null);
             brand.setBrandKeyword(null);