订单导入bug

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -10,7 +10,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
     ADD_STUDENT("ADD_STUDENT", "乐团报名"),
     RENEW("RENEW", "乐团续费"),
     SPORADIC("SPORADIC", "缴费"),
-    OTHER("OTHER", "其他"),
+    OTHER("OTHER", "其他订单"),
     SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP课报名"),
     PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课报名"),
     PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -1933,7 +1933,7 @@ public class ExportServiceImpl implements ExportService {
                                 subtract(row.getTeachingFee()).subtract(row.getMaintenanceFee()).subtract(row.getMaintenanceProductFee()).
                                 subtract(feeByType.getOtherFee()).subtract(row.getLeaseFee()).subtract(row.getCloudTeacherFee()).
                                 subtract(row.getVipCourseFee()).subtract(row.getPracticeCourseFee()));
-                    } else if (row.getType().equals(OrderTypeEnum.REPAIR)) {
+                    } else if (row.getGroupType().equals(OrderTypeEnum.REPAIR)) {
                         row.setRepairFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()).subtract(feeByType.getOtherFee()));
                     }else if (row.getGroupType() == GroupType.OUTORDER) {
                         //销售收入
@@ -2211,7 +2211,7 @@ public class ExportServiceImpl implements ExportService {
                                 subtract(row.getTeachingFee()).subtract(row.getMaintenanceFee()).subtract(row.getMaintenanceProductFee()).
                                 subtract(feeByType.getOtherFee()).subtract(row.getLeaseFee()).subtract(row.getCloudTeacherFee()).
                                 subtract(row.getVipCourseFee()).subtract(row.getPracticeCourseFee()));
-                    } else if (row.getType().equals(OrderTypeEnum.REPAIR)) {
+                    } else if (row.getGroupType().equals(OrderTypeEnum.REPAIR)) {
                         row.setRepairFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()).subtract(feeByType.getOtherFee()));
                     }else if (row.getGroupType() == GroupType.OUTORDER) {
                         //销售收入

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -417,7 +417,12 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                             sb.append("第" + rowNum).append("行数据导入失败：订单类型不可为空;");
                             continue valueIsNull;
                         } else {
-                            objectMap.put("type", row.get(s));
+                            for (OrderTypeEnum orderTypeEnum : OrderTypeEnum.values()) {
+                                if (orderTypeEnum.getMsg().equals(row.get(s).toString())) {
+                                    objectMap.put(columnValue, orderTypeEnum);
+                                    break;
+                                }
+                            }
                         }
                     }
                     if (columnValue.equals("transNo")) {