xuq

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -130,14 +130,19 @@ public class OrderBaseExcelLogic {
             String linkName = row.get(6);
             String userMobile = row.get(7);
             String userMobile2 = row.get(8);
-            String address = row.get(9);
-            String saleCompany = row.get(10);
-            String orderStatus = row.get(11);
-            String workerName = row.get(12);
-            String workerMobile = row.get(13);
-            String createTime = row.get(14);
-            String isQdText = row.get(15);
-            String remark = row.get(16);
+
+            String p = row.get(9);
+            String c = row.get(10);
+            String a = row.get(11);
+            String s = row.get(12);
+            String address = row.get(13);
+            String saleCompany = row.get(14);
+            String orderStatus = row.get(15);
+            String workerName = row.get(16);
+            String workerMobile = row.get(17);
+            String createTime = row.get(18);
+            String isQdText = row.get(19);
+            String remark = row.get(20);
 
             Boolean isQd = StringUtils.equals(isQdText, "是");
 
@@ -397,14 +402,14 @@ public class OrderBaseExcelLogic {
         List<PgOrderProduct> pgOrderProducts = new ArrayList<>();
         //默认最多10个机型
         for (int i = 0; i < 10; i++) {
-            String brandName = row.get(6 * i + 17);
-            String mainName = row.get(6 * i + 18);
-            String smallName = row.get(6 * i + 19);
-            String productName = row.get(6 * i + 20);
-            String productNum = row.get(6 * i + 21);
-            String remark = row.get(6 * i + 22);
+            String brandName = row.get(6 * i + 21);
+            String mainName = row.get(6 * i + 22);
+            String smallName = row.get(6 * i + 23);
+            String productName = row.get(6 * i + 24);
+            String productNum = row.get(6 * i + 25);
+            String remark = row.get(6 * i + 26);
             if (StringUtils.isBlank(brandName)) {
-                continue;
+                brandName = "格力";
             }
             if (StringUtils.isAnyBlank(mainName, smallName, productNum)) {
                 throw new RemoteServiceException("第" + (index) + "行 产品大类/产品小类/商品数量 不能为空");