--no commit message

app/member/src/main/java/com/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java

 package com.zrqx.member.bg.pmember.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -20,4 +22,11 @@ public interface PersonalMemberMapper extends BaseMapper<PersonalMember>{
 			+ " eq(m.id,id) "
 			+ "</script>")
 	public PMemberVO getById(@Param("id")Integer id);
+
+	@Select("<script> select pm.id,pm.vip,pm.vipId "
+			+ "from m_personal_member pm "
+			+ "left join m_member m on m.id = pm.id "
+			+ "where m.status != 2 and pm.vip = 1 "
+			+ "</script>")
+	public List<PersonalMember> queryVipMember();
 }

app/member/src/main/java/com/zrqx/member/bg/pmember/service/PersonalMemberService.java

 package com.zrqx.member.bg.pmember.service;
 
+import java.util.List;
+
 import com.zrqx.core.service.BaseService;
 import com.zrqx.member.commons.form.bg.pmember.SaveOrUpdatePMemberForm;
 import com.zrqx.member.commons.model.PersonalMember;
@@ -8,4 +10,5 @@ import com.zrqx.member.commons.vo.bg.member.PMemberVO;
 public interface PersonalMemberService extends BaseService<PersonalMember, Integer> {
 	void saveOrUpdate(SaveOrUpdatePMemberForm form);
 	PMemberVO getById(Integer id);
+	List<PersonalMember> queryVipMember();
 }

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

 package com.zrqx.member.bg.pmember.service;
 
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,4 +91,9 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, I
 	public PMemberVO getById(Integer id) {
 		return mapper.getById(id);
 	}
+
+	@Override
+	public List<PersonalMember> queryVipMember(){
+		return mapper.queryVipMember();
+	}
 }

app/member/src/main/java/com/zrqx/member/bg/vip/controller/VipController.java

+package com.zrqx.member.bg.vip.controller;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.enums.ResponseCodeEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.member.bg.pmember.service.PersonalMemberService;
+import com.zrqx.member.bg.vip.service.VipService;
+import com.zrqx.member.commons.model.PersonalMember;
+import com.zrqx.member.commons.model.Vip;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * vip会员服务
+ * 
+ * @author Administrator
+ *
+ */
+@RestController
+@RequestMapping("/bg/vip")
+@Api(description = "VIP会员服务")
+public class VipController {
+	@Autowired
+	private VipService service;
+	@Autowired
+	private PersonalMemberService personalMemberService;
+
+	@ApiOperation(value = "保存", notes = "无id新增,有id更新")
+	@PostMapping(value = "/save")
+	public CallBack<Boolean> save(@RequestBody Vip entity) {
+		if (entity.getId() == null) {
+			if (!service.insert(entity)) {
+				throw new BaseException(ResponseCodeEnum.FAIL);
+			}
+		} else {
+			if (!service.updateByPrimaryKey(entity)) {
+				throw new BaseException(ResponseCodeEnum.FAIL);
+			}
+		}
+		return CallBack.success(true);
+	}
+
+	@ApiOperation(value = "删除", notes = "删除")
+	@PostMapping(value = "/delete/{oid}")
+	public CallBack<Boolean> deleteByIds(@PathVariable Integer oid) {
+		if (!service.deleteByPrimaryKey(oid)) {
+			throw new BaseException(ResponseCodeEnum.FAIL);
+		}
+		return CallBack.success(true);
+	}
+
+	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = "{oid}")
+	public CallBack<Vip> getById(@PathVariable Integer oid) {
+		Vip entity = service.selectByPrimaryKey(oid);
+		return CallBack.success(entity);
+	}
+
+	@ApiOperation(value = "分页查询", notes = "分页查询")
+	@GetMapping(value = "/page")
+	public CallBack<PageInfo<Vip>> getUserPage(PageParam pageParam) {
+		PageInfo<Vip> page = service.queryAll(pageParam);
+		// 会员数量		
+		List<PersonalMember> pmList = personalMemberService.queryVipMember();
+		Map<Integer, Long> map =
+		pmList.stream().collect(Collectors.groupingBy(PersonalMember :: getVipId,
+		Collectors.counting())); page.getList().stream().forEach(li ->
+		li.setMemberNum( map.get(li.getId()) == null ? 0 :
+		map.get(li.getId()).intValue()));
+		return CallBack.success(page);
+	}
+}

app/member/src/main/java/com/zrqx/member/bg/vip/mapper/VipMapper.java

+package com.zrqx.member.bg.vip.mapper;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.member.commons.model.Vip;
+
+public interface VipMapper extends BaseMapper<Vip>{
+
+}

app/member/src/main/java/com/zrqx/member/bg/vip/service/VipService.java

+package com.zrqx.member.bg.vip.service;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.member.commons.model.Vip;
+
+public interface VipService extends BaseService<Vip, Integer> {
+
+}

app/member/src/main/java/com/zrqx/member/bg/vip/service/VipServiceImpl.java

+package com.zrqx.member.bg.vip.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.member.bg.vip.mapper.VipMapper;
+import com.zrqx.member.commons.model.Vip;
+
+@Service
+public class VipServiceImpl extends BaseServiceImpl<Vip,Integer> implements VipService {
+	@Autowired
+	private VipMapper mapper;
+	@Override
+	public BaseMapper<Vip> getMapper() {
+		return mapper;
+	}
+}