后管会员页面新增memberId字段

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java

@@ -51,10 +51,11 @@ public class MemberBasicInfoController extends BaseController {
      * 查询会员基础信息列表
      */
     @PreAuthorize("@ss.hasPermi('member:info:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(MemberBasicInfo memberBasicInfo) {
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody MemberBasicInfo memberBasicInfo) {
         startPage();
-        List<MemberVO> list = memberBasicInfoService.selectMemberList(memberBasicInfo.getMobileNumber(), memberBasicInfo.getNickName());
+        // List<MemberVO> list = memberBasicInfoService.selectMemberList(memberBasicInfo.getMobileNumber(), memberBasicInfo.getNickName());
+        List<MemberVO> list = memberBasicInfoService.selectMemberList(memberBasicInfo);
         return getDataTable(list);
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java

@@ -105,7 +105,11 @@ public interface MemberBasicInfoMapper {
 	MemberVO queryMemberInfoByMemberId(String memberId);
 
 
-	List<MemberVO> selectMemberList(@Param("mobileNumber") String mobileNumber, @Param("nickName") String nickName);
-
+	/**
+	 * 查询会员基本信息列表
+	 * @param memberBasicInfo
+	 * @return
+	 */
+	List<MemberVO> selectMemberList(@Param("memberBasicInfo") MemberBasicInfo memberBasicInfo);
 
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java

@@ -104,6 +104,14 @@ public interface IMemberBasicInfoService {
 	 */
 	MemberVO queryMemberInfoByMemberId(String memberId);
 
+	/**
+	 * 查询会员基本信息列表（后管用）
+	 * @param memberBasicInfo
+	 * @return
+	 */
+	List<MemberVO> selectMemberList(MemberBasicInfo memberBasicInfo);
+
+
 	List<MemberVO> selectMemberList(String mobileNumber, String nickName);
 
 	/**

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -268,9 +268,29 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		return vo;
 	}
 
+	/**
+	 * 查询用户基本信息列表
+	 * @param mobileNumber
+	 * @param nickName
+	 * @return
+	 */
 	@Override
 	public List<MemberVO> selectMemberList(String mobileNumber, String nickName) {
-		return memberBasicInfoMapper.selectMemberList(mobileNumber, nickName);
+		MemberBasicInfo memberBasicInfo = new MemberBasicInfo();
+		memberBasicInfo.setMobileNumber(mobileNumber);
+		memberBasicInfo.setNickName(nickName);
+
+		return selectMemberList(memberBasicInfo);
+	}
+
+	/**
+	 * 查询用户基本信息列表
+	 * @param memberBasicInfo
+	 * @return
+	 */
+	@Override
+	public List<MemberVO> selectMemberList(MemberBasicInfo memberBasicInfo) {
+		return memberBasicInfoMapper.selectMemberList(memberBasicInfo);
 	}
 
 	/**

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -207,9 +207,11 @@
         FROM
             member_basic_info t1
         JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0'
-        where t1.del_flag = '0'
-        <if test="mobileNumber != null and mobileNumber != ''">and mobile_number like '%${mobileNumber}%'</if>
-        <if test="nickName != null and nickName != ''">and nick_name like '%${nickName}%'</if>
+        where
+            t1.del_flag = '0'
+        <if test="memberBasicInfo.mobileNumber != null and memberBasicInfo.mobileNumber != ''">and t1.mobile_number like '%${memberBasicInfo.mobileNumber}%'</if>
+        <if test="memberBasicInfo.nickName != null and memberBasicInfo.nickName != ''">and t1.nick_name like '%${memberBasicInfo.nickName}%'</if>
+        <if test="memberBasicInfo.memberId != null and memberBasicInfo.memberId != ''">and t1.member_id like '%${memberBasicInfo.memberId}%'</if>
     </select>
 
 

jsowell-ui/src/api/member/info.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
 // 查询会员基础信息列表
-export function listInfo(query) {
+export function listInfo(data) {
     return request({
         url: '/member/info/list',
-    method: 'get',
-    params: query
+        method: 'post',
+        data: data
     })
 }
 
@@ -87,8 +87,8 @@ export function deletePlateNumber(data) {
     })
 }
 
- //修改车牌号
-export function updatePlateNumber(data){
+//修改车牌号
+export function updatePlateNumber(data) {
     return request({
         url: '/member/info/updatePlateNumber',
         method: 'post',
@@ -97,7 +97,7 @@ export function updatePlateNumber(data){
 }
 
 // 查询会员详情页 平台测试员状态
-export function selectPlatformTesterStatus(data){
+export function selectPlatformTesterStatus(data) {
     return request({
         url: '/member/info/selectPlatformTesterStatus',
         method: 'post',
@@ -106,7 +106,7 @@ export function selectPlatformTesterStatus(data){
 }
 
 // 修改会员详情页 平台测试员状态
-export function updatePlatformTester(data){
+export function updatePlatformTester(data) {
     return request({
         url: '/member/info/updatePlatformTester',
         method: 'post',

jsowell-ui/src/views/member/info/index.vue

@@ -1,6 +1,16 @@
 <template>
     <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+            <el-form-item label="会员id" prop="memberId">
+                <el-input
+                    v-model="queryParams.memberId"
+                    placeholder="请输入会员id"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
             <el-form-item label="昵称" prop="nickName">
                 <el-input
                     v-model="queryParams.nickName"
@@ -72,9 +82,10 @@
         </el-row>
 
         <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+            <el-table-column type="selection" width="55" align="center"/>
             <!--<el-table-column label="" align="center" prop="id" />-->
-      <el-table-column label="昵称" align="center" prop="nickName" >
+            <el-table-column label="会员id" align="center" prop="memberId"/>
+            <el-table-column label="昵称" align="center" prop="nickName">
                 <template slot-scope="scope">
                     <router-link
                         :to="'/member/detail/index/'+scope.row.memberId"
@@ -84,7 +95,7 @@
                     </router-link>
                 </template>
             </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" >
+            <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag
                         :options="dict.type.member_status"
@@ -92,16 +103,18 @@
                     />
                 </template>
             </el-table-column>
-      <el-table-column label="头像" align="center" prop="avatarUrl" >
+            <el-table-column label="头像" align="center" prop="avatarUrl">
                 <template slot-scope="scope">
-<!--          <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
-          <el-image style="height: 50px;width: 50px" :src="scope.row.avatarUrl === null? defaultImg[0].img :scope.row.avatarUrl" :preview-src-list='[scope.row.avatarUrl === null? defaultImg[0].img :scope.row.avatarUrl]'/>
+                    <!--          <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
+                    <el-image style="height: 50px;width: 50px"
+                              :src="scope.row.avatarUrl === null? defaultImg[0].img :scope.row.avatarUrl"
+                              :preview-src-list='[scope.row.avatarUrl === null? defaultImg[0].img :scope.row.avatarUrl]'/>
                 </template>
             </el-table-column>
-      <el-table-column label="手机号" align="center" prop="mobileNumber" />
-      <el-table-column label="本金余额" align="center" prop="principalBalance" />
-<!--      <el-table-column label="赠送余额" align="center" prop="giftBalance" />-->
-      <el-table-column label="备注" align="center" prop="remark" />
+            <el-table-column label="手机号" align="center" prop="mobileNumber"/>
+            <el-table-column label="本金余额" align="center" prop="principalBalance"/>
+            <!--      <el-table-column label="赠送余额" align="center" prop="giftBalance" />-->
+            <el-table-column label="备注" align="center" prop="remark"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button
@@ -110,21 +123,23 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['member:info:edit']"
-          >修改</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdateGiftBalance(scope.row)"-->
-<!--            v-hasPermi="['member:balance:update']"-->
-<!--          >充值/扣款</el-button>-->
+                    >修改
+                    </el-button>
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-edit"-->
+                    <!--            @click="handleUpdateGiftBalance(scope.row)"-->
+                    <!--            v-hasPermi="['member:balance:update']"-->
+                    <!--          >充值/扣款</el-button>-->
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['member:info:remove']"
-          >删除</el-button>
+                    >删除
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -141,19 +156,19 @@
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="会员Id" prop="memberId">
-          <el-input v-model="form.memberId" :disabled="true" placeholder="请输入手机号" />
+                    <el-input v-model="form.memberId" :disabled="true" placeholder="请输入手机号"/>
                 </el-form-item>
                 <el-form-item label="手机号" prop="mobileNumber">
-          <el-input v-model="form.mobileNumber" :disabled="true" placeholder="请输入手机号" />
+                    <el-input v-model="form.mobileNumber" :disabled="true" placeholder="请输入手机号"/>
                 </el-form-item>
                 <el-form-item label="昵称" prop="nickName">
-          <el-input v-model="form.nickName" placeholder="请输入昵称" />
+                    <el-input v-model="form.nickName" placeholder="请输入昵称"/>
                 </el-form-item>
                 <el-form-item label="头像url" prop="avatarUrl">
-          <el-input v-model="form.avatarUrl" placeholder="请输入头像url" />
+                    <el-input v-model="form.avatarUrl" placeholder="请输入头像url"/>
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+                    <el-input v-model="form.remark" placeholder="请输入备注"/>
                 </el-form-item>
                 <!--<el-form-item label="本金余额" prop="principalBalance">
                   <el-input v-model="form.principalBalance" placeholder="请输入本金余额" />
@@ -169,7 +184,8 @@
         </el-dialog>
 
         <!-- 添加或修改会员余额对话框 -->
-    <el-dialog title="会员充值/扣款" @close="closeUpdateGiftBalance" :visible.sync="openUpdateGiftBalance" width="500px" append-to-body>
+        <el-dialog title="会员充值/扣款" @close="closeUpdateGiftBalance" :visible.sync="openUpdateGiftBalance" width="500px"
+                   append-to-body>
             <p>后管平台只能充值赠送余额，本金余额只能客户通过手机端充值</p>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="操作类型">
@@ -177,7 +193,8 @@
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="giftBalance">
-          <el-input-number v-model="updateGiftBalance" placeholder="请输入金额" :min="0" :controls="false" :precision="2"></el-input-number>
+                    <el-input-number v-model="updateGiftBalance" placeholder="请输入金额" :min="0" :controls="false"
+                                     :precision="2"></el-input-number>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -196,7 +213,7 @@ export default {
     dicts: ['member_status'],
     data() {
         return {
-        defaultImg:[{img:require('../../../assets/images/headPort.png')}],
+            defaultImg: [{img: require('../../../assets/images/headPort.png')}],
             // 遮罩层
             loading: true,
             // 选中数组
@@ -227,14 +244,14 @@ export default {
                 status: null,
                 avatarUrl: null,
                 mobileNumber: null,
+                memberId: null,
                 principalBalance: null,
                 giftBalance: null,
             },
             // 表单参数
             form: {},
             // 表单校验
-      rules: {
-      }
+            rules: {}
         };
     },
     computed: {
@@ -250,7 +267,13 @@ export default {
         /** 查询会员基础信息列表 */
         getList() {
             this.loading = true;
-      listInfo(this.queryParams).then(response => {
+            const params = {
+                memberId: this.queryParams.memberId,
+                nickName: this.queryParams.nickName,
+                mobileNumber: this.queryParams.mobileNumber
+            }
+            console.log("params", params)
+            listInfo(params).then(response => {
                 this.infoList = response.rows;
                 console.log(this.infoList);
                 this.total = response.total;
@@ -293,7 +316,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+            this.single = selection.length !== 1
             this.multiple = !selection.length
         },
         /** 新增按钮操作 */
@@ -378,12 +401,13 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除会员基础信息编号为"' + ids + '"的数据项？').then(function() {
+            this.$modal.confirm('是否确认删除会员基础信息编号为"' + ids + '"的数据项？').then(function () {
                 return delInfo(ids);
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+            }).catch(() => {
+            });
         },
         /** 导出按钮操作 */
         handleExport() {