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

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -111,7 +111,7 @@ public class NewsController extends BaseController {
 	@GetMapping(value = "/queryPage")
 	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 		
-		if(queryInfo.getType() == 6 || queryInfo.getType() == 7){
+		if(queryInfo.getType() != null && (queryInfo.getType() == 6 || queryInfo.getType() == 7)){
 			queryInfo.setTenantId(-1);
 		}
 		

cms/src/main/java/com/ym/mec/cms/interceptor/TenantInterceptor.java

@@ -29,7 +29,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 		
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		
-		if(sysUser != null){
+		if(sysUser != null && sysUser.getId() != null){
 			TenantContextHolder.setTenantId(sysUser.getTenantId());
 			
 			TenantInfo tenantInfo = tenantInfoService.get(sysUser.getTenantId());

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -269,7 +269,7 @@
 				and find_in_set(#{subjectId},sni.subject_id_list_)
 			</if>
 			<if test="organId != null">
-				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null)
+				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null or sni.organ_id_list_ = '')
 			</if>
 		<if test="clientName != 'manage'">
 			<choose>

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/dal/vo/TenantInfoInfoPageVo.java

@@ -33,6 +33,9 @@ public class TenantInfoInfoPageVo implements Serializable {
     private Integer state;
 
     @ApiModelProperty(value = "创建人名称")
+    private String logo;
+
+    @ApiModelProperty(value = "创建人名称")
     private String createdName;
 
     //机构产品信息
@@ -94,6 +97,14 @@ public class TenantInfoInfoPageVo implements Serializable {
         this.state = state;
     }
 
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
     public String getServeName() {
         return serveName;
     }

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-biz/src/main/resources/config/mybatis/SysCouponIssueRecordMapper.xml

@@ -168,7 +168,7 @@
           AND status_ = 1
           AND tenant_id_ = #{tenantId}
           AND a.`limit_exchange_num_` > IFNULL(b.couponNum, 0)
-          AND NOW() >= end_date_
+          AND NOW() >= start_date_ AND end_date_ >= NOW()
           AND (
                     stock_count_ > consume_num_
                 OR stock_count_ = - 1

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

@@ -41,6 +41,7 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="pay_state_" jdbcType="INTEGER" property="payState"/>
         <result column="state_" jdbcType="INTEGER" property="state"/>
+        <result column="logo_" jdbcType="VARCHAR" property="logo"/>
         <result column="real_name_" jdbcType="VARCHAR" property="createdName"/>
         <!-- 机构产品信息-->
         <result column="serve_name_" jdbcType="VARCHAR" property="serveName"/>
@@ -55,6 +56,7 @@
         a.`phone_`,
         a.`pay_state_`,
         a.`state_`,
+        a.logo_,
         u.`real_name_`,
         c.`name_` AS serve_name_,
         d.`student_up_limit_`,

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @RequestMapping("repair")
 @Api(tags = "学生维修服务")
@@ -107,13 +108,10 @@ public class RepairController extends BaseController {
     @ApiOperation("获取维修记录详情")
     @GetMapping(value = "/getRepairInfo")
     public HttpResponseResult getRepairInfo(Integer id,Integer studentId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if ((sysUser == null || sysUser.getId() ==null) && studentId == null) {
-            return failed("用户信息获取失败");
-        }
-        if(sysUser.getId() != null){
-            studentId = sysUser.getId();
-        }
+        Optional.ofNullable(studentId)
+                .map(sysUserFeignService::queryUserById)
+                .orElseThrow(() -> new BizException("用户信息获取失败"));
+
         StudentRepair repairInfo = studentRepairService.getRepairInfo(id);
         if (!repairInfo.getStudentId().equals(studentId)) {
             return failed("您的维修记录不存在");

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));
 	}