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

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicMemberQueryInfo.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 public class MusicMemberQueryInfo extends EducationBaseQueryInfo {
 
-	@ApiModelProperty(value = "0已过期，1即将过期,2待生效", required = false)
+	@ApiModelProperty(value = "0已过期，1即将过期,2待生效,3生效中", required = false)
 	private Integer hasMember = 0;
 
 	private String memberEndAutoQuitMusic;

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

@@ -3779,7 +3779,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public PageInfo<MusicMemberDto> queryMusicMemberList(MusicMemberQueryInfo queryInfo) {
-        String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT, queryInfo.getTenantId());
+         String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT, queryInfo.getTenantId());
         if (StringUtils.isEmpty(configValue)) {
             configValue = "15";
         }

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

@@ -802,9 +802,13 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         SysUser user = sysUserFeignService.queryUserInfo();
         Map<Integer, String> receivers = new HashMap<>();
         receivers.put(user.getId(), "yanite1234@sina.com");
-        receivers.put(2, "yanite2016@sina.com");
-        receivers.put(3, "yanite@qq.com");
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团", "xiaofeng", "this is password");
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团1", "xiaofeng", "this is password");
+
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_RENEWAL_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团2", "xiaofeng", "this is password");
+
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_EXPIRATION_REMINDERS, receivers, null, 0, null, "SYSTEM", "小风乐团3", "xiaofeng", "this is password");
+
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_INSUFFICIENT_BALANCE, receivers, null, 0, null, "SYSTEM", "小风乐团4", "xiaofeng", "this is password");
 
         return false;
     }

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

@@ -910,6 +910,7 @@
         <result property="membershipEndTime" column="membership_end_time_"/>
         <result property="hasMember" column="has_member_"/>
     </resultMap>
+
     <select id="queryMusicMemberList" resultMap="MusicMemberDto">
         SELECT sr.user_id_,su.username_,su.phone_,o.name_ organ_name_,mg.name_ music_group_name_,mg.course_view_type_,
         DATEDIFF(sr.membership_end_time_,NOW()) member_day_,sr.music_group_id_,MAX(sv.visit_time_) visit_time_,sr.membership_end_time_,#{hasMember} has_member_
@@ -941,15 +942,18 @@
                 AND mg.educational_teacher_id_ = #{educationUserId}
             </if>
             <if test="hasMember != null">
-                <if test="hasMember == 0">
+                <if test="hasMember == 0"> <!-- 0已过期  -->
                     AND (sr.membership_end_time_ IS NULL OR sr.membership_end_time_ &lt; NOW()) AND cto.id_ IS NULL
                 </if>
-                <if test="hasMember == 1">
-                    AND cto.id_ IS NULL AND DATEDIFF(sr.membership_end_time_,NOW()) &lt;= #{memberEndAutoQuitMusic} AND sr.membership_end_time_ > NOW()
+                <if test="hasMember == 1"> <!--  1即将过期  -->
+                    AND cto.status_ = 2 AND cto.id_ IS NULL AND DATEDIFF(sr.membership_end_time_,NOW()) &lt;= #{memberEndAutoQuitMusic} AND sr.membership_end_time_ > NOW()
                 </if>
-                <if test="hasMember == 2">
+                <if test="hasMember == 2"> <!--  2待生效  -->
                     AND cto.id_ IS NOT NULL
                 </if>
+                <if test="hasMember == 3"> <!-- 3生效中  cto.status ['1-生效中 2-已生效 3-已退',] -->
+                    AND cto.status_ = 1 AND (sr.membership_end_time_ IS NULL OR sr.membership_end_time_ &lt; NOW())
+                </if>
             </if>
             <if test="visitStartTime != null">
                 AND MAX(sv.visit_time_) BETWEEN #{visitStartTime} AND #{visitEndTime}

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

@@ -329,6 +329,13 @@ public class MusicGroupController extends BaseController {
 	@GetMapping("/queryMusicMemberList")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryMusicMemberList')")
 	public HttpResponseResult<PageInfo<MusicMemberDto>> queryMusicMemberList(MusicMemberQueryInfo queryInfo) {
+		if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			if (sysUser == null) {
+				throw new BizException("用户信息获取失败");
+			}
+			queryInfo.setOrganId(sysUser.getOrganId().toString());
+		}
 		queryInfo = organizationService.onlyEducation(queryInfo);
 		return succeed(musicGroupService.queryMusicMemberList(queryInfo));
 	}