--no commit message

app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java

@@ -30,7 +30,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "]]>"
 			+ "</if>";
 	
-	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,pm.vip,pm.endTime "
+	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,,(case when pm.vip = 1 then 1 when pm.orderType = 3 then 3 when  pm.vip = 0 then 0  end ) vip,pm.endTime "
 			+ " from m_member m left join m_personal_member pm on m.id = pm.id "
 			+ " where status != 2 and level = 0 ";
 

app/member/src/main/java/com/zrqx/member/bg/omember/controller/OrganMemberController.java

@@ -197,6 +197,13 @@ public class OrganMemberController {
 					Organ organ = organService.selectByPrimaryKey(form.getId());
 					pm.setSchoolId(form.getId().toString());
 					pm.setOrganName(organ.getName());
+					//机构会员到期日期
+					if(pm.getVip() == null) {
+						pm.setVip(0);
+					}
+					if(pm.getVip() == 0){
+						pm.setEndTime(organ.getEndTime());
+					}
 					pm.setId(memberList.get(0).getId());
 					//是否机构
 					pm.setOrderType(organ.getOrderType());

app/member/src/main/java/com/zrqx/member/commons/model/PersonalMember.java

@@ -35,10 +35,11 @@ public class PersonalMember {
 	@ApiModelProperty("用户性别 0 女 1男 2保密")
 	private Integer sex;
 
-	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	@ApiModelProperty("vip会员  0否 1是 2已过期  3机构会员")
 	private Integer vip;
 	@ApiModelProperty("vip类型id")
 	private Integer vipId;
 	@ApiModelProperty("vip会员结束日期")
 	private Date endTime;
+
 }

app/member/src/main/java/com/zrqx/member/fg/member/controller/FgMemberController.java

@@ -104,6 +104,7 @@ public class FgMemberController {
 	public CallBack<FgMemberVo> getMember() {
 		LoginMemberInfo member = redis.getMember();
 		FgMemberVo vo = mapper.getMember(member.getId());
+		
 		return CallBack.success(vo);
 	}
 

app/member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java

@@ -445,6 +445,7 @@ public class PersonalCenterConteroller {
 			if (pm.getEndTime() != null) {
 				if (pm.getEndTime().before(new Date())) {
 					pm.setVip(2);
+					pm.setOrderType(0);
 					pmService.updateByPrimaryKey(pm);
 				}
 			}

app/member/src/main/java/com/zrqx/member/fg/school/controller/FgClassTabelController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -148,6 +149,9 @@ public class FgClassTabelController {
 	@ApiOperation(value = "加入班级", notes = "加入班级")
 	@PostMapping(value = "/save/class")
 	public CallBack<Boolean> saveClass(@RequestBody FgClassTableForm form) {
+		if(StringUtils.isBlank(form.getClassCode())) {
+			throw new BaseException(5, "班级码不能为空");
+		}
 		// 班级码查询班级
 		Example example = service.createExample();
 		example.createCriteria().andEqualTo("classCode", form.getClassCode());