excel导入订单优化

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -2551,7 +2551,7 @@ public class AdminOrderController {
         ResponseJson responseJson = new ResponseJson();
         Product product = new Product();
         List<Product> productList = productService.listProductAndColorAndfittings(product);
-        HashMap<String,Set<String>> map = new HashMap<>();
+        HashMap<String,List<String>> map = new HashMap<>();
         for(Product pro : productList){
             for(ProductColor color : pro.getColorList()){
                 StringBuffer str = new StringBuffer(pro.getProductName());
@@ -2569,20 +2569,24 @@ public class AdminOrderController {
                 }else{
                     str.append(color.getColorName()+color.getColorAbbreviation());
                 }
-                if(color.getColorlabel() != null){
-                    str.append(color.getColorlabel());
-                }
-                System.out.println(color.getColorId()+"----"+str);
                 Set<String> setString = null;
                 try {
                     setString = AnalyzerUtil.productsplitWord(str.toString());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                map.put(color.getColorId().toString(),setString);
+
+                List<String> result = new ArrayList<>(setString);
+                if(color.getColorlabel() != null){
+                    String[] strArr = color.getColorlabel().split("@");
+                    for(String strs : strArr){
+                        result.add(strs);
+                    }
+                }
+                map.put(color.getColorId().toString(),result);
             }
         }
-        RedisUtils.put("order_productList",map);
+        RedisUtils.put("order_productList2",map);
         return responseJson;
     }
 
@@ -2601,17 +2605,8 @@ public class AdminOrderController {
             responseJson.setReturnCode(500);
             return responseJson;
         }
-        /*excelProductName = new String(excelProductName.getBytes("ISO-8859-1"),"UTF-8");*/
-        /*excelProductName = "watero滤芯T1";*/
-        /*excelProductName = "上朵lips牙刷幻影黑";*/
-        /*excelProductName = "WB-2水机珍珠白";*/
-        /*excelProductName = "银离子水箱";*/
-        /*excelProductName = "规格:滤芯组（T1/T2*2+T3/T4*1）;";*/
-        /*excelProductName = "水龙头净水器";*/
-        /*excelProductName = "果蔬机STY02";*/
-        /*excelProductName = "Watero净水机滤芯 T2";*/
-
-        HashMap<String,JSONArray> map = RedisUtils.get("order_productList",HashMap.class);
+
+        HashMap<String,JSONArray> map = RedisUtils.get("order_productList2",HashMap.class);
         Set<String>  nameList = AnalyzerUtil.productsplitWord(excelProductName);
 
         Map<String,Integer> productNums = new TreeMap<>();