--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/member/ExcelMemberExportVo.java

@@ -6,6 +6,8 @@ import lombok.Data;
 
 import com.zrqx.core.util.excelutil.ExcelResources;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * 订单展示详情vo对象
  * @author ydm
@@ -16,17 +18,31 @@ public class ExcelMemberExportVo {
 	
 	@ExcelResources(title="会员编号",order=1)
 	private Integer id;
-	
-	@ExcelResources(title="会员名称",order=2)
+	@ExcelResources(title="会员账号",order=2)
 	private String account;
-	
-	@ExcelResources(title="手机号",order=3)
+	@ExcelResources(title="会员电话",order=3)
 	private String phone;
-	
-	@ExcelResources(title="注册时间",order=4)
+	@ExcelResources(title="用户状态 0 禁用 1启用",order=4)
+	private Integer status;
+	@ExcelResources(title="创建时间",order=5)
 	private Date createTime;
 	
-	@ExcelResources(title="用户状态 ",order=5)
-	private String status;
+	@ExcelResources(title="抽奖时间",order=6)
+	private String prizedate;
+	
+	@ExcelResources(title="抽奖次数",order=7)
+	private String prizecount;
+	
+	@ExcelResources(title="是否中奖",order=8)
+	private String isstues;
+	
+	@ExcelResources(title="奖品名称",order=9)
+	private String prizename;
+	
+	@ExcelResources(title="奖品状态",order=10)
+	private String prizetype;
+	
+	@ExcelResources(title="姓名",order=2)
+	private String name;
 	
 }

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

@@ -70,30 +70,40 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "</script>")
 	public int isExist(@Param("id")Integer id,@Param("account")String account);
 	
-	@Select("<script> select m.id,account,status,phone,level,a.balance,createTime "
-			+ "from m_member m left join m_assets a "
-			+ "on m.id = a.id "
-			+ "where status != 2  "
-			+ "<if test = '"+NOTBLANK+"(account)' >"
-			+ " and m.account like concat(#{account},'%') "
+	@Select("<script> "
+			+ " select tt.* from ("
+			+ "select m.id,account,name,status,phone,createTime,prizedate,"
+			+ " IFNULL(prizecount,0) prizecount,case when IFNULL((select count(*) from m_member_priaze a where  a.memberid = m.id ),0) >0 then  '是' else '否' end isstues,"
+			+ " (select GROUP_CONCAT(prizename) from m_member_priaze a where  a.memberid = m.id ) prizename,"
+			+ " (select GROUP_CONCAT(prizestate) from m_member_priaze a where  a.memberid = m.id ) prizestate,"
+			+ " case when (select prizetype from m_member_priaze a where  a.memberid = m.id ORDER BY prizetype desc LIMIT 1) = 1 then '已领取' else '未领取'  end prizetype"
+			+ "  from m_member m where 1=1 and status != 2"
+			
+            + "<if test = '"+NOTBLANK+"(form.text)' >"
+			+ "<if test = 'form.type == 1' >"
+			+ " and m.nickName like concat('%',#{form.text},'%') "
+			+ "</if>"
+			+ "<if test = 'form.type == 2' >"
+			+ " and m.name like concat('%',#{form.text},'%') "
+			+ "</if>"
+			+ "<if test = 'form.type == 3' >"
+			+ " and m.phone like concat('%',#{form.text},'%') "
+			+ "</if>"
 			+ "</if>"
 			
-			+ "<if test = 'status != null' >"
-			+ " and m.status = #{status} "
+			+ "  ) tt"
+			+ " where 1=1"
+			+ "<if test = '"+NOTBLANK+"(form.prizename)' >"
+			+ " and tt.prizestate like concat('%',#{form.prizename},'%')   "
 			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
-			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
-			+ "]]>"
+			+ "<if test = '"+NOTBLANK+"(form.isprize)' >"
+			+ " and tt.isstues = #{form.isprize} "
 			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(endTime)' >"
-			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
-			+ "]]>"
+			+ "<if test = '"+NOTBLANK+"(form.prizetype)' >"
+			+ " and tt.prizetype = #{form.prizetype} "
 			+ "</if>"
-			+ " order by createTime desc "
 			+ "</script>")
-	public List<ExcelMemberExportVo> list(QueryMemberForm query);
+	public List<MemberListVO> list(QueryMemberForm query);
 	
 	/**
 	 * 判断 手机号是否已存在

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

@@ -33,6 +33,6 @@ public interface MemberService  extends BaseService<Member, Integer> {
 	 * @param query
 	 * @return
 	 */
-	List<ExcelMemberExportVo> importMember(QueryMemberForm query);
+	List<MemberListVO> importMember(QueryMemberForm query);
 	boolean isExistByPhone(Integer id, String phone);
 }

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

@@ -55,7 +55,7 @@ public class MemberServiceImpl  extends BaseServiceImpl<Member,Integer> implemen
 		}
 	}
 	@Override
-	public List<ExcelMemberExportVo> importMember(QueryMemberForm query) {
+	public List<MemberListVO> importMember(QueryMemberForm query) {
 		return mapper.list(query);
 	}
 	@Override