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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -38,7 +38,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		List<SysMenu> sysMenus;
 		List<SysMenu> sysMenusAllList;
 
-		if(sysUser.getTenantId() == -1 || sysUser.getIsSuperAdmin()){
+		if(sysUser.getTenantId() == -1 && sysUser.getIsSuperAdmin()){
 			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 			sysMenusAllList = sysMenuDao.findList(null,menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 		}else {

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderActivityDao.java

@@ -15,4 +15,6 @@ public interface MusicGroupPaymentCalenderActivityDao extends BaseDAO<Long, Musi
     List<MusicGroupPaymentCalenderActivity> findByCalenderId(Long calenderId);
 
     List<MusicGroupPaymentCalenderActivity> findByIds(@Param("activityIdList") List<Long> buyCalenderActivityIdList);
+
+    List<MusicGroupPaymentCalenderActivity> findByActivityIds(@Param("activityIdList") List<Long> buyCalenderActivityIdList,@Param("calenderId") Long calenderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderActivityService.java

@@ -21,4 +21,6 @@ public interface MusicGroupPaymentCalenderActivityService {
     List<MusicGroupPaymentCalenderActivity> findByCalenderId(Long calenderId);
 
     List<MusicGroupPaymentCalenderActivity> findByIds(List<Long> buyCalenderActivityIdList);
+
+    List<MusicGroupPaymentCalenderActivity> findByActivityIds(List<Long> buyCalenderActivityIdList,Long calenderId);
 }

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

@@ -138,4 +138,9 @@ public class MusicGroupPaymentCalenderActivityServiceImpl extends BaseServiceImp
     public List<MusicGroupPaymentCalenderActivity> findByIds(List<Long> buyCalenderActivityIdList) {
         return musicGroupPaymentCalenderActivityDao.findByIds(buyCalenderActivityIdList);
     }
+
+    @Override
+    public List<MusicGroupPaymentCalenderActivity> findByActivityIds(List<Long> buyCalenderActivityIdList,Long calenderId) {
+        return musicGroupPaymentCalenderActivityDao.findByActivityIds(buyCalenderActivityIdList,calenderId);
+    }
 }

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

@@ -448,14 +448,16 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
     public Map<String, Object> getCalenderDetail(Map<String, Object> result, Long calenderId) {
         //课程
-        result.put("course", musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId));
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId);
+        result.put("course", courseSettingsList==null?null:courseSettingsList.size() == 0?null:courseSettingsList);
         //乐保
         result.put("repair", musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId);
         //会员信息
         result.put("member", calenderMember);
         //活动相关信息
-        result.put("activity", musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId));
+        List<MusicGroupPaymentCalenderActivity> byCalenderId = musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId);
+        result.put("activity", byCalenderId==null?null:byCalenderId.size() == 0?null:byCalenderId);
         if (calenderMember != null) {
             result.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calenderMember.getMemberRankSettingId()));
         }

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

@@ -3,10 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -587,7 +584,6 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             studentCourseFeeDetail.setOperator(studentPaymentOrder.getUserId());
             studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
         }
-        studentRegistrationDao.update(studentRegistration);
 
         //缴费项目详情
         musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder, studentRegistration);
@@ -632,11 +628,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
         //学生云教练处理
         if (detailTypeEnums.contains(CLOUD_TEACHER)) {
+            if(studentPaymentOrder.getType() == OrderTypeEnum.APPLY){
+                studentRegistration.setHasCloudTeacher(1);
+            }
             BigDecimal cloudTeacherFee = allDetails.stream().filter(o -> o.getType() == CLOUD_TEACHER)
                     .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
         }
+        studentRegistrationDao.update(studentRegistration);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderActivityDao.xml

@@ -108,4 +108,11 @@
           #{id}
         </foreach>
     </select>
+    <select id="findByActivityIds" resultType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
+      SELECT <include refid="Base_Column_List"/> FROM music_group_payment_calender_activity
+      WHERE calender_id_ = #{calenderId} AND activity_id_ IN
+        <foreach collection="activityIdList" separator="," item="id" close=")" open="(">
+          #{id}
+        </foreach>
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -469,7 +469,8 @@
         LEFT JOIN sys_user u on ta.teacher_id_ = u.id_
         WHERE ta.sign_out_status_ IS NULL and cs.tenant_id_ = #{tenantId}
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-        AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) <= DATE_SUB(now(),INTERVAL #{minutes} MINUTE) AND cs.del_flag_ = 0
+        AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) <= DATE_SUB(now(),INTERVAL #{minutes} MINUTE)
+        AND cs.class_date_ = DATE_FORMAT(NOW(),'%Y-%m-%d') AND cs.del_flag_ = 0
         AND cs.group_type_ = 'MUSIC'
     </select>
     <select id="findTeacherIdByCourseSchedule" resultMap="TeacherAttendance">

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -191,19 +191,19 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("detailType", orderDetailType);
             orderDetail.put("chargeTypeId", musicGroup.getChargeTypeId());
             orderDetail.put("courseViewType", musicGroup.getCourseViewType());
-            //如果包含vip和网管，代表购买了活动包
-            if (orderDetailType.contains("VIP") || orderDetailType.contains("PRACTICE")) {
-                List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
-                                || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
-                        .collect(Collectors.toList());
-                orderDetail.put("activity", musicGroupPaymentCalenderActivityService.findByIds(activityList));
-            }
 
             //新的课程形态10.27
             MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroup.getId());
             if (musicGroupRegCalender != null) {
                 List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroup.getId());
                 musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+                //如果包含vip和网管，代表购买了活动包
+                List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
+                        || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
+                        .collect(Collectors.toList());
+                if(activityList != null && activityList.size() > 0){
+                    orderDetail.put("activity", musicGroupPaymentCalenderActivityService.findByActivityIds(activityList,musicGroupRegCalender.getId()));
+                }
             }
             orderDetail.put("calender", musicGroupRegCalender);
 

mec-web/src/main/java/com/ym/mec/web/config/PermissionCheckService.java

@@ -27,7 +27,7 @@ public class PermissionCheckService {
 		}
 
 		SysUser user = sysUserFeignService.queryUserInfo();
-		if(user.getTenantId() == -1){
+		if(user.getTenantId() == -1 && user.getIsSuperAdmin()){
 			return true;
 		}
 

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -112,6 +113,7 @@ public class EmployeeController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('employee/update')")
     public Object update(@RequestBody Employee employee) {
+        TenantContextHolder.setTenantId(employee.getTenantId());
         employee.setUpdateTime(new Date());
         employeeService.updateEmployee(employee);
         return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/PlatformServeController.java

@@ -26,7 +26,7 @@ public class PlatformServeController extends BaseController {
 
     @ApiOperation("添加平台服务")
     @PostMapping(value = "/add")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/add')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/add')")
     public Object addServe(@Valid @RequestBody PlatformServeDto dto) {
         platformServeService.addServe(dto);
         return succeed();
@@ -34,7 +34,7 @@ public class PlatformServeController extends BaseController {
 
     @ApiOperation("修改平台服务")
     @PostMapping(value = "/update")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/update')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/update')")
     public Object updateServe(@Valid @RequestBody PlatformServeDto dto) {
         platformServeService.updateServe(dto);
         return succeed();
@@ -42,7 +42,7 @@ public class PlatformServeController extends BaseController {
 
     @ApiOperation("删除平台服务")
     @GetMapping(value = "/delete/{id}")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/delete')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/delete')")
     public Object deleteServe(@ApiParam(value = "平台服务ID", required = true) @PathVariable("id") Integer id) {
         platformServeService.deleteServe(id);
         return succeed();
@@ -50,21 +50,21 @@ public class PlatformServeController extends BaseController {
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/queryPage')")
     public Object queryPage(String search, Integer page, Integer rows) {
         return succeed(platformServeService.queryPage(search, page, rows));
     }
 
     @ApiOperation("查询单个服务的详情")
     @GetMapping(value = "/queryInfo/{id}")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/queryInfo')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/queryInfo')")
     public Object queryInfo(@ApiParam(value = "平台服务ID", required = true) @PathVariable("id") Integer id) {
         return succeed(platformServeService.queryInfo(id));
     }
 
     @ApiOperation("查询单个服务各付费模式详情")
     @GetMapping(value = "/queryModeDetail/{id}")
-    @PreAuthorize("@pcs.hasPermissions('/platformServe/queryModeDetail')")
+    @PreAuthorize("@pcs.hasPermissions('platformServe/queryModeDetail')")
     public Object queryModeDetail(@ApiParam(value = "平台服务ID", required = true) @PathVariable("id") Integer id) {
         return succeed(platformServeService.queryModeDetail(id));
     }