fix

@@ -40,6 +40,17 @@ public class TblLogicService {
     @Autowired
     @Autowired
     private TblImgUrlLogicService tblImgUrlLogicService;
     private TblImgUrlLogicService tblImgUrlLogicService;
 
 
+    public final static Map<Integer, String> countryFieldMap = new HashMap<Integer, String>() {{
+        put(374, "美国");
+        put(44, "英国");
+        put(46, "瑞典");
+        put(81, "日本");
+        put(82, "韩国");
+        put(852, "香港");
+        put(49, "德国");
+        put(86, "国内现货");
+    }};
+
     /**
     /**
      * 全量构建
      * 全量构建
      *
      *
@@ -227,7 +238,6 @@ public class TblLogicService {
         }
         }
         return sortMap;
         return sortMap;
     }
     }
-
     /**
     /**
      * 处理brand
      * 处理brand
      *
      *
@@ -243,9 +253,7 @@ public class TblLogicService {
             productIndexBO.setBrandName(tblBrand.getBrandNameEn());
             productIndexBO.setBrandName(tblBrand.getBrandNameEn());
             productIndexBO.setBrandNameEn(tblBrand.getBrandNameEn());
             productIndexBO.setBrandNameEn(tblBrand.getBrandNameEn());
             productIndexBO.setBrandNameCn(tblBrand.getBrandNameCn());
             productIndexBO.setBrandNameCn(tblBrand.getBrandNameCn());
-            if (tblBrand.getBrandId() != null) {
-                productIndexBO.setShopId(tblBrand.getBrandId() * (-1));
-            }
+            productIndexBO.setShopId(tblBrand.getBrandId()*(-1));
         } else {
         } else {
             // 增量当品牌删除的时候
             // 增量当品牌删除的时候
             productIndexBO.setBrandName(null);
             productIndexBO.setBrandName(null);
@@ -473,6 +481,9 @@ public class TblLogicService {
         productIndexBO.setIsDiscount("N");
         productIndexBO.setIsDiscount("N");
         productIndexBO.setBreakingRate(0d);
         productIndexBO.setBreakingRate(0d);
         productIndexBO.setBasePinRatio(0);
         productIndexBO.setBasePinRatio(0);
+        //处理国家id和名称
+        productIndexBO.setTblCountryId(tblProduct.getCountryId());
+        productIndexBO.setTblCountryName(countryFieldMap.get(tblProduct.getCountryId()));
         return productIndexBO;
         return productIndexBO;
 
 
     }
     }