--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/bg/emember/service/ExpertMemberServiceImpl.java

@@ -29,7 +29,7 @@ public class ExpertMemberServiceImpl extends BaseServiceImpl<ExpertMember,Intege
 	}
 	@Override
 	public void saveOrUpdate(SaveOrUpdateEMemberForm form) {
-		if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+		if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 			throw new BusinessValidateException("用户已存在！");
 		}
 		Member m = new Member();
@@ -39,7 +39,7 @@ public class ExpertMemberServiceImpl extends BaseServiceImpl<ExpertMember,Intege
 		if (form.getId() == null) {
 			//新增
 			synchronized(this) {
-				if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+				if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 					throw new BusinessValidateException("用户已存在！");
 				}
 				m.setLevel(1);
@@ -59,7 +59,7 @@ public class ExpertMemberServiceImpl extends BaseServiceImpl<ExpertMember,Intege
 		}else {
 			//修改
 			synchronized(this) {
-				if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+				if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 					throw new BusinessValidateException("用户已存在！");
 				}
 				Member old = mmapper.selectByPrimaryKey(m.getId());

com.zrqx.member/src/main/java/com/zrqx/member/bg/member/controller/MemberController.java

@@ -57,6 +57,11 @@ public class MemberController {
 	public CallBack<Boolean> isExistByAccount(Integer id, String account) {
 		return CallBack.success(service.isExistByAccount(id, account));
 	}
+	@ApiOperation(value = "查询手机是否被使用", notes = "查询会员账号是否存在-普通用户和机构用户 共用此接口 0：可用； 99： 已被使用；")
+	@GetMapping(value = MemberRequestPath.PHONE)
+	public CallBack<Boolean> isExistByPhone(Integer id, String phone) {
+		return CallBack.success(service.isExistByPhone(id, phone));
+	}
 	@ApiOperation(value = "批量新增测试用户", notes = "批量新增测试用户")
 	@PostMapping(value = MemberRequestPath.BATCH_SAVE+MemberRequestPath.VALUE)
 	public CallBack<Boolean> save(@PathVariable("value") Integer value, @RequestBody SaveMemberForm form) {

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

@@ -13,11 +13,14 @@ import com.zrqx.core.vo.member.bg.pm.PmMemberListVO;
 
 public interface MemberMapper extends BaseMapper<Member>{
 	
-	@Select("<script> select m.id,account,status,phone,level,a.balance,createTime,pm.endTime "
+	@Select("<script> select m.id,account,status,phone,level,a.balance,createTime,pm.vip,pm.endTime "
 			+ "from m_member m left join m_assets a  "
 			+ "on m.id = a.id "
 			+ "left join m_personal_member pm on m.id = pm.id "
-			+ "where status != 2 and level = #{level} "
+			+ "where status != 2 "
+			+ "<if test = 'level != null' >"
+			+ " and m.level = #{level} and (pm.vip != 1 or pm.vip is null) "
+			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(account)' >"
 			+ " and m.account like concat(#{account},'%') "
 			+ "</if>"
@@ -27,6 +30,9 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "<if test = 'status != null' >"
 			+ " and m.status = #{status} "
 			+ "</if>"
+			+ "<if test = 'vip != null' >"
+			+ " and m.level = 0 and pm.vip = #{vip} "
+			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
 			+ "<![CDATA["
 			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
@@ -54,12 +60,18 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @return
 	 */
 	@Select("<script>select count(id) from m_member "
-			+ "where account =#{account} "
+			+ "where 1=1"
+			+ "<if test = '"+NOTBLANK+"(account)' >"
+			+ " and account = #{account} "
+			+ "</if>"
 			+ "<if test = 'id != null' >"
 			+ " and id != #{id} "
 			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(phone)' >"
+			+ " and phone = #{phone} "
+			+ "</if>"
 			+ "</script>")
-	public int isExist(@Param("id")Integer id,@Param("account")String account);
+	public int isExist(@Param("id")Integer id,@Param("account")String account,@Param("phone")String phone);
 	
 	@Select("<script>"
 			+ "select id from m_personal_member "

com.zrqx.member/src/main/java/com/zrqx/member/bg/member/service/MemberService.java

@@ -26,6 +26,13 @@ public interface MemberService  extends BaseService<Member, Integer> {
 	 */
 	PageInfo<PmMemberListVO> pageMember(String a2p,PageParam pageParam);
 	boolean isExistByAccount(Integer id, String account);
+	/**
+	 * 判断手机号是否注册
+	 * @param id
+	 * @param account
+	 * @return
+	 */
+	boolean isExistByPhone(Integer id, String phone);
 	void save(List<Member> mlist);
 	List<Integer> queryCheckExpired();
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/member/service/MemberServiceImpl.java

@@ -35,7 +35,11 @@ public class MemberServiceImpl  extends BaseServiceImpl<Member,Integer> implemen
 	}
 	@Override
 	public boolean isExistByAccount(Integer id, String account) {
-		return mapper.isExist(id, account) > 0;
+		return mapper.isExist(id, account, null) > 0;
+	}
+	@Override
+	public boolean isExistByPhone(Integer id, String phone) {
+		return mapper.isExist(id, null,phone) > 0;
 	}
 	@Override
 	public void save(List<Member> mlist) {

com.zrqx.member/src/main/java/com/zrqx/member/bg/pmember/service/PersonalMemberServiceImpl.java

@@ -32,7 +32,7 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, I
 
 	@Override
 	public void saveOrUpdate(SaveOrUpdatePMemberForm form) {
-		if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+		if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 			throw new BusinessValidateException("用户已存在！");
 		}
 		Member m = new Member();
@@ -42,7 +42,7 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, I
 		if (form.getId() == null) {
 			// 新增
 			synchronized (this) {
-				if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+				if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 					throw new BusinessValidateException("用户已存在！");
 				}
 				m.setLevel(0);
@@ -61,7 +61,7 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, I
 		} else {
 			// 修改
 			synchronized (this) {
-				if(mmapper.isExist(form.getId(),form.getAccount()) > 0) {
+				if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
 					throw new BusinessValidateException("用户已存在！");
 				}
 				Member old = mmapper.selectByPrimaryKey(m.getId());

com.zrqx.member/src/main/java/com/zrqx/member/fg/pmember/service/FgPersonalMemberServiceImpl.java

@@ -32,6 +32,7 @@ public class FgPersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember,
 		mmapper.insertSelective(m);
 		PersonalMember pm = new PersonalMember();
 		pm.setId(m.getId());
+		pm.setVip(0);
 		mapper.insert(pm);
 	}