Merge remote-tracking branch 'origin/develop' into develop

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

@@ -898,11 +898,6 @@ public class OrderBaseExcelLogic {
             String workerName = row.get(37);
             String managerGroup = row.get(38);
 
-
-            if (userMobile.length() > 11) {
-                throw new RemoteServiceException(errPrefix + "请输入正确的客户手机号");
-            }
-
             DateTime dateTime = null;
             try {
                 dateTime = DateUtil.parseDateTime(createTime);
@@ -932,7 +927,7 @@ public class OrderBaseExcelLogic {
 
             OrderSmallType orderSmallType1 = orderSmallTypeMap.get(orderType);
             if (orderSmallType1 == null) {
-                throw new RemoteServiceException(errPrefix + "工单类型不存在");
+               // throw new RemoteServiceException(errPrefix + "工单类型不存在");
             }
 
             //工单状态
@@ -940,13 +935,13 @@ public class OrderBaseExcelLogic {
             if (StringUtils.isNotBlank(status)) {
                 importBaseStatusEnum = BaseEnum.valueToEnum(OrderBaseStatusEnum.class, status);
                 if (importBaseStatusEnum == null) {
-                    throw new RemoteServiceException(errPrefix + "工单状态不存在");
+                   // throw new RemoteServiceException(errPrefix + "工单状态不存在");
                 }
             }
 
             Region region = orderBaseLogic.getRegion(province, city, area, street);
             if (region == null) {
-                throw new RemoteServiceException(errPrefix + "地址【" + province + city + area + street + "】解析失败");
+              //  throw new RemoteServiceException(errPrefix + "地址【" + province + city + area + street + "】解析失败");
             }
 
 
@@ -958,12 +953,14 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setOrderStatusText(importBaseStatusEnum.getRemark());
             pgOrderBase.setServiceStatus(serviceStatus);
 
-            pgOrderBase.setOrderType(orderSmallType1.getOrderType());
-            pgOrderBase.setOrderTypeText(BaseEnum.keyToEnum(OrderTypeEnum.class, orderSmallType1.getOrderType()).getRemark());
+            pgOrderBase.setOrderType(orderSmallType1 == null?orderType:orderSmallType1.getOrderType());
+            pgOrderBase.setOrderTypeText(
+                    orderSmallType1 == null?orderType:BaseEnum.keyToEnum(OrderTypeEnum.class, orderSmallType1.getOrderType()).getRemark()
+            );
 
 
-            pgOrderBase.setOrderSmallType(orderSmallType1.getId());
-            pgOrderBase.setOrderSmallTypeText(orderSmallType1.getOrderSmallTypeText());
+            pgOrderBase.setOrderSmallType(orderSmallType1 == null?orderType:orderSmallType1.getId());
+            pgOrderBase.setOrderSmallTypeText(orderSmallType1 == null?orderType:orderSmallType1.getOrderSmallTypeText());
 
             pgOrderBase.setCompanyWechatId(adminUser.getCompanyWechatId());
             pgOrderBase.setCompanyWechatName(adminUser.getCompanyName());
@@ -974,14 +971,14 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setUserMobile(userMobile);
 
 
-            pgOrderBase.setProvinceId(region.getProvinceCode());
-            pgOrderBase.setProvince(region.getProvinceName());
-            pgOrderBase.setCity(region.getCityName());
-            pgOrderBase.setCityId(region.getCityCode());
-            pgOrderBase.setArea(region.getAreaName());
-            pgOrderBase.setAreaId(region.getAreaCode());
-            pgOrderBase.setStreet(region.getName());
-            pgOrderBase.setStreetId(region.getId());
+            pgOrderBase.setProvinceId(region == null?province:region.getProvinceCode());
+            pgOrderBase.setProvince(region == null?province:region.getProvinceName());
+            pgOrderBase.setCity(region == null?city:region.getCityName());
+            pgOrderBase.setCityId(region == null?city:region.getCityCode());
+            pgOrderBase.setArea(region == null?area:region.getAreaName());
+            pgOrderBase.setAreaId(region == null?area:region.getAreaCode());
+            pgOrderBase.setStreet(region == null?street:region.getName());
+            pgOrderBase.setStreetId(region == null?street:region.getId());
             pgOrderBase.setAddress(address);
 
             if (adminWebsit == null) {
@@ -1110,14 +1107,14 @@ public class OrderBaseExcelLogic {
 
                 GoodsCategory mainGoodsCategory = categoryMap1.get(categoryType);
 
-                if (mainGoodsCategory == null) {
+           /*     if (mainGoodsCategory == null) {
                     throw new RemoteServiceException("第" + (index) + "行 产品大类不存在");
-                }
+                }*/
 
                 PgOrderProduct pgOrderProduct = new PgOrderProduct();
                 pgOrderProduct.setOrderBaseId(pgOrderId);
                 pgOrderProduct.setNum(Convert.toInt(totalNum));
-                pgOrderProduct.setMainId(mainGoodsCategory.getCategoryId());
+                pgOrderProduct.setMainId(mainGoodsCategory==null?categoryType:mainGoodsCategory.getCategoryId());
                 pgOrderProduct.setMainName(categoryType);
 
                 Brand brand = brandMap.get("格力");