Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

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

@@ -763,7 +763,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             }
             Map<Integer,BigDecimal> cloudTeacherFee = memberDetailList.stream()
                     .collect(Collectors.toMap(e->e.getStudentInstrumentId().intValue(),
-                            o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee())));
+                            StudentPaymentOrderDetail::getPrice));
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee,calenderMembers);
         }
     }
@@ -866,7 +866,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             }
             Map<Integer,BigDecimal> cloudTeacherFee = memberDetailList.stream()
                     .collect(Collectors.toMap(e->e.getStudentInstrumentId().intValue(),
-                            o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee())));
+                            StudentPaymentOrderDetail::getPrice));
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee,calenderMembers);
         }
     }

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

@@ -634,7 +634,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             //获取试听课数量
             Map<Integer, Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teachers))), HashMap.class);
 
-            Map<Integer, String> organNames = getMap("organization", "id_", "name_", false, 1, Integer.class, String.class);
+            Map<Integer, String> organNames = getMap("organization", "id_", "name_", false, queryInfo.getTenantId(), Integer.class, String.class);
             for (Teacher e : rows) {
                 e.setOrganName(organNames.get(e.getTeacherOrganId()));
                 if (StringUtils.isNotEmpty(e.getSplitSubjectName())) {