Merge remote-tracking branch 'origin/style' into jsh77b

src/main/java/com/style24/batch/biz/job/shoplinker/TsbShoplinkerStockJob.java

@@ -214,7 +214,7 @@ public class TsbShoplinkerStockJob extends TsbAbstractJob<Collection<ShoplinkerG
 	private int GetStockQtyForBrand(ShoplinkerGoods map, boolean isFirst)
     {
         int resultQty = 0;
-        String brandCd = map.getBrand();
+        String brandCd = map.getBrandCd();
         int qty = map.getQuantity();
 
         if (brandCd.equals("S0016") || brandCd.equals("S0018") || brandCd.equals("S0012"))

src/main/java/com/style24/persistence/mybatis/shop/TsbShoplinker.xml

@@ -56,6 +56,12 @@
 				  WHEN TG.BRAND_CD = 'S0006' THEN 9
 				  WHEN TG.BRAND_CD = 'S0013' THEN 10
 				  WHEN TG.BRAND_CD = 'S0015' THEN 11
+				  WHEN TG.BRAND_CD = 'S0008' THEN 12
+				  WHEN TG.BRAND_CD = 'S0009' THEN 13
+				  WHEN TG.BRAND_CD = 'S0002' THEN 14
+				  WHEN TG.BRAND_CD = 'S0010' THEN 15
+				  WHEN TG.BRAND_CD = 'S0011' THEN 16
+				  WHEN TG.BRAND_CD = 'S0014' THEN 17
 				  ELSE 99
 			  END RANK_NO		       
 		FROM   SHOPLINKER_STOCK A