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

 Conflicts:

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

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

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

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

@@ -40,12 +40,13 @@ public interface ImLiveBroadcastRoomDao extends BaseMapper<ImLiveBroadcastRoom>
      */
     IPage<RoomReservationUserVo> queryRoomUser(@Param("page") IPage<RoomReservationUserVo> page,
                                                   @Param("query") RoomReservationUserSearch query);
+
+    String querySchoolIds(@Param("organIds") String organIds);
+
     List<LiveRoomGoodsOrderVo> queryLiveRoomGoodsOrderList(Map<String, Object> params);
 
     int countLiveRoomGoodsOrderList(Map<String, Object> params);
 
     Map sumLiveRoomGoodsOrderList(Map<String, Object> params);
-
-    String querySchoolIds(@Param("organIds") String organIds);
 }
 

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

@@ -197,13 +197,18 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         pageInfo.setDesc("a.created_time_");
         param.put("tenantId", TenantContextHolder.getTenantId());
         //查询该人员分部  及 分部下包含的学校(合作单位)
-        Integer userId = getSysUser().getId();
-        Employee employee = employeeService.get(userId);
-        if (Objects.nonNull(employee) && Objects.nonNull(employee.getOrganIdList())) {
-            param.put("organIds", employee.getOrganIdList());
-            String schoolIds = baseMapper.querySchoolIds(employee.getOrganIdList());
-            if (StringUtils.isNotBlank(schoolIds)) {
-                param.put("schoolIds", schoolIds);
+        SysUser sysUser = getSysUser();
+        //如果是超管就查询当前机构所有的直播间
+        if (sysUser.getTenantId() == -1 || sysUser.getIsSuperAdmin()) {
+            param.put("allRoom", 1);
+        } else {
+            Employee employee = employeeService.get(sysUser.getId());
+            if (Objects.nonNull(employee) && Objects.nonNull(employee.getOrganIdList())) {
+                param.put("organIds", employee.getOrganIdList());
+                String schoolIds = baseMapper.querySchoolIds(employee.getOrganIdList());
+                if (StringUtils.isNotBlank(schoolIds)) {
+                    param.put("schoolIds", schoolIds);
+                }
             }
         }
         IPage<ImLiveBroadcastRoomVo> page = baseMapper.queryPage(pageInfo, param);

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

@@ -349,8 +349,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount(),
                     PlatformCashAccountDetailTypeEnum.REFUNDS, order.getMemo() + ",订单号:" + order.getOrderNo());
 
-            //退还优惠券
-            sysCouponCodeService.quit(order.getCouponCodeId());
             if (StringUtils.isNotBlank(order.getPaymentChannel())
                     && order.getPaymentChannel().equals("ADAPAY")
                     && !rpMap.containsKey("simulation")) {