From c3102bcb1650465b681c823524c51a3b03aa5c90 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 13 Aug 2024 16:21:40 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/api/order/oilnumgun.js         |    8 +
 fuintAdmin/src/api/setting/message.js         |   37 +
 fuintAdmin/src/api/staff/user/user.js         |    8 +
 fuintAdmin/src/assets/images/wenhao.png       |  Bin 0 -> 704 bytes
 fuintAdmin/src/views/fleet/tab/fleetInfo.vue  |    2 +-
 .../src/views/fleet/tab/fleetMember.vue       |    2 +-
 fuintAdmin/src/views/member/index.vue         | 1138 ++++++++++-------
 fuintAdmin/src/views/member/manage.vue        |  623 +++++++--
 .../controller/UserMassSendController.java    |   25 +
 .../userGroup/entity/UserMassSend.java        |    9 +-
 .../mapper/xml/UserMassSendRecordMapper.xml   |    7 +-
 .../service/impl/UserGroupServiceImpl.java    |    7 +
 .../impl/UserMassSendRecordServiceImpl.java   |    7 +
 .../service/impl/UserMassSendServiceImpl.java |   42 +-
 .../business/userGroup/vo/UserGroupVo.java    |   11 +
 .../userGroup/vo/UserMassSendRecordVo.java    |    4 +
 .../controller/UserBalanceController.java     |   10 +-
 .../userManager/entity/UserBalance.java       |    4 +
 .../userManager/mapper/xml/LJUserMapper.xml   |    2 +-
 .../service/UserBalanceService.java           |    7 +
 .../service/impl/UserBalanceServiceImpl.java  |    9 +
 .../business/userManager/vo/LJUserVo.java     |    4 +
 22 files changed, 1374 insertions(+), 592 deletions(-)
 create mode 100644 fuintAdmin/src/api/setting/message.js
 create mode 100644 fuintAdmin/src/assets/images/wenhao.png

diff --git a/fuintAdmin/src/api/order/oilnumgun.js b/fuintAdmin/src/api/order/oilnumgun.js
index f67264c26..e965a9ed1 100644
--- a/fuintAdmin/src/api/order/oilnumgun.js
+++ b/fuintAdmin/src/api/order/oilnumgun.js
@@ -44,6 +44,14 @@ export function getOilNameList() {
   })
 }
 
+// 查询所有油号
+export function oilNumberList() {
+  return request({
+    url: '/business/petrolStationManagement/oilNumber/getList',
+    method: 'get',
+    // data: data
+  })
+}
 
 // 查询所有油号
 export function oilNumbers() {
diff --git a/fuintAdmin/src/api/setting/message.js b/fuintAdmin/src/api/setting/message.js
new file mode 100644
index 000000000..1f74cd23f
--- /dev/null
+++ b/fuintAdmin/src/api/setting/message.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getListApi(query) {
+  return request({
+    url: 'messageTemplate',
+    method: 'get',
+    params: query
+  })
+}
+
+//
+export function deleteApi(ids) {
+  return request({
+    url: 'messageTemplate?idList=' + ids,
+    method: 'delete'
+  })
+}
+//
+export function saveApi(data) {
+  return request({
+    url: 'messageTemplate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 保存修改信息
+export function updateApi(data) {
+  return request({
+    url: 'messageTemplate',
+    method: 'put',
+    data: data
+  })
+}
+
+
diff --git a/fuintAdmin/src/api/staff/user/user.js b/fuintAdmin/src/api/staff/user/user.js
index c780ce0fd..d91e93b2f 100644
--- a/fuintAdmin/src/api/staff/user/user.js
+++ b/fuintAdmin/src/api/staff/user/user.js
@@ -84,3 +84,11 @@ export function exportUsers() {
     method: 'get'
   })
 }
+
+//注销用户
+export function logOffUsers(id) {
+  return request({
+    url: '/business/userManager/userbalance/'+id,
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/assets/images/wenhao.png b/fuintAdmin/src/assets/images/wenhao.png
new file mode 100644
index 0000000000000000000000000000000000000000..f17b032f4c33bd1844476390af471c32f2a693a3
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px%dPzh<R7gv;mC0)qK^Vo~SCfbt$Y8ohC7zS+#={WI#U*<5B7%Q_M+aOE3L>bu
zpb;a8!5my59{mFZ5rRjJ%P9d5LwA$2Axlp}E(u|#pLS&?PLf{cFxItReZP9&QYHA$
zOS0k<P*uk{E@X)!{gGbCd5ZipT=%B{VOoqtKrk>+KrVNSWEmodV}p<jA~K13{kb_e
zw-%>~1q6<BmgIW?2eTYD_LoHDqUpMyckA~60?UeS{F*>lo58hAfEviFrteR-p4$P4
zZVvKOQt<udGNiW`>*M3GYz+}P*Xm>&5apb?++12(jF}loK98VO0ya033@%B%KG3Ym
zKY(qI61bO^7Gri6($j-rXb9NYNR$fj#Pq!Tjnn~AD+ZSJJF#0Dq1pw2TrhqANYujG
zLEtziNq);JYTJOQ=pv^~*Zr;mRolKC0&hAAP{0+#^WHWcJR<p^lK>HUY`X444Oq6U
zrx3Z*NdU;PqVM0`a$wun3B2qiK!6*j=S^(Yz_Lz<B44rqebdu=(5l13K&_T4SL7MP
z_rGdDG`UsVo+nUDJCz$81iHIXuT)Zl3$Sc>UVk*%+k>`jSz{2no%-|^3V>4J>T0@K
z@>$XMbxpScYmQ@XhGFIJLw6|Y^ns}<ouZYI5rB-Bk&FA3I$ChuU<W|g!g0=rVfX<e
zD(<v??DBc6PfR2Q50z3E4A=eG6zqAf_0W;8k|2q>Awwl{EgG&?P3(u$aPlrKT{}SJ
zqEhNo>&+7#G&iD})WYy4MaoIt6?Kb{lU+)^Xy$yk!*)LXt`*BVL6Ku5_1`Qa3qsEH
m`Th_6$)v1IK-TbO?f(Ie2M;KO`~-FY0000<MNUMnLSTX+N<=UK

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 8084630ca..ab65bdca4 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -64,7 +64,7 @@
       <!--    <el-card class="box-card" style="min-height: 500px;" shadow="never">-->
       <div class="table-box">
         <el-table
-          :data="orderList"
+          :data="orderList" border
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="fleetName" align="center" label="车队名称"></el-table-column>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index fb7ffeeb6..ee6971aec 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -69,7 +69,7 @@
       <!--    <el-card class="box-card" style="min-height: 500px;" shadow="never">-->
       <div class="table-box">
         <el-table
-          :data="orderList"
+          :data="orderList" border
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="fleetName" align="center" label="车队名称"></el-table-column>
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index b09689e9f..1b84207d8 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -1,233 +1,290 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <el-card>
       <div style="display: flex;align-items: center;justify-content: space-between">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="" prop="userNo">
-          <el-input
-            v-model="queryParams.userNo"
-            placeholder="请输入会员号"
-            clearable
-            style="width: 180px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="mobile">
-          <el-input
-            v-model="queryParams.mobile"
-            placeholder="请输入会员手机号"
-            clearable
-            style="width: 180px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入会员名称"
-            clearable
-            style="width: 180px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 160px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 160px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="" prop="gradeId">
-          <el-select
-            v-model="queryParams.gradeId"
-            clearable
-            placeholder="会员等级"
-          >
-            <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="balance">
-          <el-select
-            v-model="ifBalance"
-            clearable
-            placeholder="有无储值余额"
-          >
-            <el-option label="有储值余额" value="haveBalance"/>
-            <el-option label="无储值余额" value="noHaveBalance"/>
-          </el-select>
-        </el-form-item>
-        <div style="float: right">
-          <el-button style="background: linear-gradient( 180deg, #FF8646 0%, #FFA360 100%); border: transparent " type="primary"  @click="handleQuery">搜索</el-button>
-          <el-button  @click="resetQuery">重置</el-button>
-          <el-button type="primary" @click="handleAdd"
-                     v-hasPermi="['member:index:add']"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+          <el-form-item label="" prop="userNo">
+            <el-input
+              v-model="queryParams.userNo"
+              placeholder="请输入会员昵称"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="userNo">
+            <el-input
+              v-model="queryParams.userNo"
+              placeholder="请输入会员号"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              placeholder="请选择会员等级"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              placeholder="请选择会员标签"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="mobile">
+            <el-input
+              v-model="queryParams.mobile"
+              placeholder="请输入车牌号"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              placeholder="请选择性别"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="mobile">
+            <el-input
+              v-model="queryParams.mobile"
+              placeholder="请输入会员手机号"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入年龄"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              placeholder="请选择状态"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入余额"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="beginTime"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            至
+            <el-date-picker
+              v-model="endTime"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入剩余积分"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <div style="float: right">
+            <el-button style="background: linear-gradient( 180deg, #FF8646 0%, #FFA360 100%); border: transparent "
+                       type="primary" @click="handleQuery">搜索
+            </el-button>
+            <el-button @click="resetQuery">重置</el-button>
+            <!--          <el-button type="primary" @click="handleAdd" v-hasPermi="['member:index:add']" >新增</el-button>-->
+            <el-button type="primary" @click="addOne"
+                       v-hasPermi="['member:index:add']"
 
-          >新增</el-button>
-        </div>
+            >新增会员
+            </el-button>
+            <el-button type="primary" @click="addMult"
+                       v-hasPermi="['member:index:add']"
+
+            >批量新增
+            </el-button>
+            <el-button type="primary" @click="handleMassSend"
+                       v-hasPermi="['member:index:add']"
+
+            >会员群发
+            </el-button>
+          </div>
 
 
-      </el-form>
+        </el-form>
       </div>
-    </el-card>
+      <!--    </el-card>-->
 
-    <el-card style="margin-top: 20px">
-<!--      <div>统计</div>-->
-      <template>
-        <div class="ds-dbox">
-          <div class="k-one">
-            <div class="title_">激活会员总数</div>
-            <div class="num-size">{{total}}</div>
-              <img class="r-bot-img" src="./imgs/hy-1.png" alt="">
-            </div>
+      <!--    <el-card style="margin-top: 20px">-->
+      <!--      <template>-->
+      <!--        <div class="ds-dbox">-->
+      <!--          <div class="k-one">-->
+      <!--            <div class="title_">激活会员总数</div>-->
+      <!--            <div class="num-size">{{total}}</div>-->
+      <!--              <img class="r-bot-img" src="./imgs/hy-1.png" alt="">-->
+      <!--            </div>-->
 
-          <div class="k-two">
-            <div class="title_">今日新增/昨日新增</div>
-            <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
-            <img class="r-bot-img" src="./imgs/hy-2.png" alt="">
-          </div>
-          <div class="k-three">
-            <div class="title_">充值总人数</div>
-            <div class="num-size">{{rechargeTotal || 0}}</div>
-            <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
-          </div>
-          <div class="k-four">
-            <div class="title_">储值总余额</div>
-            <div class="num-size">{{balance}}</div>
-            <img class="r-bot-img" src="./imgs/hy-4.png" alt="">
-          </div>
-          <div class="k-five">
-            <div class="title_">积分总余额</div>
-            <div class="num-size">{{point}}</div>
-            <img class="r-bot-img" src="./imgs/hy-5.png" alt="">
-          </div>
-<!--          <el-row :gutter="20">-->
-<!--            <el-col :span="4">-->
-<!--              <div class="sta">-->
-<!--                <el-statistic-->
-<!--                  group-separator=","-->
-<!--                  :value="total"-->
-<!--                  title="会员总数"-->
-<!--                ></el-statistic>-->
-<!--              </div>-->
-<!--            </el-col>-->
-<!--            <el-col :span="4">-->
-<!--              <div class="sta">-->
-<!--                <el-statistic title="今日新增/昨日新增">-->
-<!--                  <template slot="formatter">-->
-<!--                    {{ addNum }}/{{ yesterdayAddNum }}-->
-<!--                  </template>-->
-<!--                </el-statistic>-->
-<!--              </div>-->
-<!--            </el-col>-->
-<!--            <el-col :span="4">-->
-<!--              <div class="sta">-->
-<!--                <el-statistic-->
-<!--                  group-separator=","-->
-<!--                  :precision="2"-->
-<!--                  :value="balance"-->
-<!--                  title="储值总余额"-->
-<!--                ></el-statistic>-->
-<!--              </div>-->
-<!--            </el-col>-->
+      <!--          <div class="k-two">-->
+      <!--            <div class="title_">今日新增/昨日新增</div>-->
+      <!--            <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>-->
+      <!--            <img class="r-bot-img" src="./imgs/hy-2.png" alt="">-->
+      <!--          </div>-->
+      <!--          <div class="k-three">-->
+      <!--            <div class="title_">充值总人数</div>-->
+      <!--            <div class="num-size">{{rechargeTotal || 0}}</div>-->
+      <!--            <img class="r-bot-img" src="./imgs/hy-3.png" alt="">-->
+      <!--          </div>-->
+      <!--          <div class="k-four">-->
+      <!--            <div class="title_">储值总余额</div>-->
+      <!--            <div class="num-size">{{balance}}</div>-->
+      <!--            <img class="r-bot-img" src="./imgs/hy-4.png" alt="">-->
+      <!--          </div>-->
+      <!--          <div class="k-five">-->
+      <!--            <div class="title_">积分总余额</div>-->
+      <!--            <div class="num-size">{{point}}</div>-->
+      <!--            <img class="r-bot-img" src="./imgs/hy-5.png" alt="">-->
+      <!--          </div>-->
+      <!--        </div>-->
 
-<!--            <el-col :span="4">-->
-<!--              <div class="sta">-->
-<!--                <el-statistic-->
-<!--                  group-separator=","-->
-<!--                  :value="point"-->
-<!--                  title="积分总余额"-->
-<!--                ></el-statistic>-->
-<!--              </div>-->
-<!--            </el-col>-->
+      <!--      </template>-->
+      <!--    </el-card>-->
 
-<!--          </el-row>-->
-        </div>
-
-      </template>
-    </el-card>
-
-    <el-card style="margin-top: 20px">
-
-      <el-table ref="tables" v-loading="loading" :data="list"
-                @selection-change="handleSelectionChange" :default-sort="defaultSort"
-                @sort-change="handleSortChange">
-        <el-table-column type="index" width="60" align="center" label="序号"/>
-        <el-table-column label="头像" align="center" width="70">
-          <template slot-scope="scope">
-              <img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">
-              <img v-else class="list-avatar" src="@/assets/images/avatar.png">
-          </template>
-        </el-table-column>
-        <el-table-column label="会员号" align="center" prop="userNo" width="150"/>
-        <el-table-column label="名称" align="center" prop="name" >
-          <template slot-scope="scope">
-            <span style="color: #409EFF;cursor: pointer  " @click="goDedi(scope.row.id)">{{ scope.row.name ? scope.row.name : "--" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="手机号" align="center" prop="mobile" width="110">
-          <template slot-scope="scope">
-            <span>{{ scope.row.mobile ? scope.row.mobile : '-' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="会员等级" align="center" prop="gradeId" width="80">
-          <template slot-scope="scope">
-            <span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '-' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="储值卡" align="center" prop="cardBalance">
-          <template slot-scope="scope">
-            <div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="积分" align="center" prop="points">
-          <template slot-scope="scope">
-            <div><span>{{ scope.row.points ? scope.row.points : '0.00' }}</span></div>
-          </template>
-        </el-table-column>
-        <el-table-column label="加油次数" align="center" prop="consumeNum">
-          <template slot-scope="scope">
-            <div>{{ scope.row.consumeNum ? scope.row.consumeNum : '0' }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="注册时间" align="center" width="160" prop="balCreateTime"/>
-        <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope">
-<!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
-            <div v-if="scope.row.status == 'qy' " style="color: #0DC291;" >启用</div>
-            <div v-else style="color: #FF8E8D">禁用</div>
-          </template>
-        </el-table-column>
-<!--        <el-table-column label="公众号" align="center" prop="official">-->
-<!--          <template slot-scope="scope">-->
-<!--            <dict-tag :options="dict.type.official" :value="scope.row.official"/>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column label="操作" align="center" width="120" fixed='right'>
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+      <!--    <el-card style="margin-top: 20px">-->
 
+      <div style="height: 62vh;overflow: auto;margin-top: 15px">
+        <el-table ref="tables" v-loading="loading" :data="list" border
+                  @selection-change="handleSelectionChange" :default-sort="defaultSort"
+                  @sort-change="handleSortChange">
+          <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column label="会员名称" align="center" prop="name">
+            <template slot-scope="scope">
+              <span style="color: #409EFF;cursor: pointer  "
+                    @click="goDedi(scope.row.id)">{{ scope.row.name ? scope.row.name : "--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="会员号" align="center" prop="userNo" width="100"/>
+          <el-table-column label="会员等级" align="center" prop="gradeId" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="会员标签" align="center" prop="userLabelId" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.userLabelId || '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="车牌号" align="center" prop="carNo" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.carNo || '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="手机号" align="center" prop="mobile" width="110">
+            <template slot-scope="scope">
+              <span>{{ scope.row.mobile ? scope.row.mobile : '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="生日" align="center" prop="birthday" width="110">
+            <template slot-scope="scope">
+              <span>{{ scope.row.birthday || '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="userStatus">
+            <template slot-scope="scope">
+              <div v-if="scope.row.userStatus == '0' " style="color: #0DC291;">使用中</div>
+              <div v-else style="color: #FF8E8D">已注销</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="充值次数" align="center" prop="cardBalance">
+            <template slot-scope="scope">
+              <div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="余额（元）" align="center" prop="cardBalance">
+            <template slot-scope="scope">
+              <div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="已使用金额（元）" align="center" prop="cardBalance">
+            <template slot-scope="scope">
+              <div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="剩余积分" align="center" prop="points">
+            <template slot-scope="scope">
+              <div><span>{{ scope.row.points ? scope.row.points : '0.00' }}</span></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="已使用积分" align="center" prop="points">
+            <template slot-scope="scope">
+              <div><span>{{ scope.row.points ? scope.row.points : '0.00' }}</span></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="成长值" align="center" prop="growthValue">
+            <template slot-scope="scope">
+              <div>{{ scope.row.growthValue || '0' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" width="160" prop="balCreateTime"/>
+          <el-table-column label="操作" align="center" width="150" fixed='right'>
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.userStatus == '0'"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                v-if="scope.row.userStatus == '0'"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleLogOff(scope.row)"
+              >会员注销
+              </el-button>
+              <el-button
+                v-if="scope.row.userStatus == '1'"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"
@@ -237,55 +294,32 @@
       />
     </el-card>
 
-<!--    添加会员信息，选择是否批量录入-->
+    <!--    添加会员信息，选择是否批量录入-->
     <el-dialog :title="title" width="40%" :visible.sync="openUser" append-to-body>
       <el-alert
         type="info"
         :closable="false">
         <p v-for="(item,index) in addMember" :id="index">
-          {{item}}
+          {{ item }}
         </p>
       </el-alert>
       <div style="margin: 10px 0">
         <el-button type="primary"
-                   icon="el-icon-edit-outline" @click="addOne" round>录入单个会员</el-button>
+                   icon="el-icon-edit-outline" @click="addOne" round>录入单个会员
+        </el-button>
         <el-button type="primary"
-                   icon="el-icon-connection" @click="addMult" round>批量导入会员</el-button>
+                   icon="el-icon-connection" @click="addMult" round>批量导入会员
+        </el-button>
       </div>
-<!--      <div>-->
-<!--        <el-table ref="tables" v-loading="loading" :data="userList">-->
-<!--          <el-table-column prop="batchNumber" align="center" label="批次号" width="200"/>-->
-<!--          <el-table-column prop="type" align="center" label="类型"/>-->
-<!--          <el-table-column prop="memberNumber" align="center" label="会员数"/>-->
-<!--          <el-table-column label="执行结果" align="center" >-->
-<!--            <el-table-column prop="successNumber" align="center" label="成功人数"/>-->
-<!--            <el-table-column prop="errorNumber" align="center" label="失败人数"/>-->
-<!--            <el-table-column prop="repeatNumber" align="center" label="重复人数"/>-->
-<!--          </el-table-column>-->
-<!--          <el-table-column prop="createTime" align="center" label="处理时间" width="160">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--&lt;!&ndash;          <el-table-column prop="date" align="center" label="处理结果详情"/>&ndash;&gt;-->
-<!--        </el-table>-->
-
-<!--        <pagination-->
-<!--          :total="total1"-->
-<!--          :page.sync="queryParams.page"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @pagination="getList"-->
-<!--        />-->
-<!--      </div>-->
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="会员名称" prop="name" style="width: 420px">
-              <el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30" />
+            <el-form-item label="会员名称" prop="name" >
+              <el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -296,24 +330,65 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="性别" prop="sex">
+              <el-input v-model="form.sex" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="会员号" prop="userNo">
+              <el-input v-model="form.userNo" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="会员等级" prop="gradeId">
-                <el-select
-                  v-model="form.gradeId"
-                  placeholder="会员等级"
-                  style="width: 300px"
-                >
-                  <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
-                </el-select>
+              <el-select
+                v-model="form.gradeId"
+                placeholder="请选择会员等级（多选）"
+                style="width: 100%"
+              >
+                <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="会员标签" prop="userLabelId">
+              <el-select
+                v-model="form.userLabelId"
+                placeholder="请选择会员标签（多选）"
+                style="width: 100%"
+              >
+                <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="会员号" prop="userNo">
-              <el-input v-model="form.userNo" placeholder="请输入会员号，为空系统将自动分配" maxlength="30" />
+            <el-form-item label="车牌号" prop="carNo">
+              <el-input v-model="form.carNo" placeholder="请输入身份证号" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属机构" prop="storeId" v-if="title == '修改会员'">
+              <el-select
+                v-model="form.storeId"
+                placeholder="请选择会员标签（多选）"
+                style="width: 100%"
+              >
+                <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -326,49 +401,38 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="会员初始积分" prop="points">
-              <el-input :disabled="title == '编辑会员'" v-model="form.points" placeholder="请输入会员初始积分" maxlength="30"/>
+            <el-form-item label="初始积分" prop="points" v-if="title != '修改会员'">
+              <el-input v-model="form.points" placeholder="请输入会员初始积分"
+                        maxlength="30"/>
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="初始加油金" prop="refuelMoney">-->
-<!--              <el-input v-model="form.refuelMoney" placeholder="0" maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="储值通用余额" prop="cardBalance">
-              <el-input :disabled="title == '编辑会员'" v-model="form.cardBalance" placeholder="请输入储值卡初始余额" maxlength="30"/>
+            <el-form-item label="初始成长值" prop="growthValue" v-if="title != '修改会员'">
+              <el-input v-model="form.growthValue" placeholder="请输入会员初始积分"
+                        maxlength="30"/>
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="升数卡余额" prop="literCard">-->
-<!--              <el-input v-model="form.literCard" placeholder="0" maxlength="30"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="是否关注公众号">-->
-<!--              <el-radio-group v-model="form.official">-->
-<!--                <el-radio label="ygz" value="ygz">已关注</el-radio>-->
-<!--                <el-radio label="wgz" value="wgz">未关注</el-radio>-->
-<!--              </el-radio-group>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="会员状态" prop="status">
-              <el-radio-group v-model="form.status">
-                <el-radio label="qy" value="qy">启用</el-radio>
-                <el-radio label="jy" value="jy">禁用</el-radio>
-              </el-radio-group>
+            <el-form-item label="储值余额" prop="cardBalance" v-if="title != '修改会员'">
+              <el-input v-model="form.cardBalance" placeholder="请输入储值卡初始余额"
+                        maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="会员状态" prop="userStatus">
+              <el-switch
+                v-model="form.userStatus"
+                active-value="0"
+                inactive-value="1"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
             </el-form-item>
           </el-col>
         </el-row>
@@ -382,10 +446,65 @@
       </div>
     </el-dialog>
 
-<!--    批量录入会员信息-->
+    <!-- 添加或修改对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="openMassSend" append-to-body>
+      <el-form ref="form" :model="form1" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="群发名称" prop="name" >
+              <el-input v-model="form1.name" placeholder="请输入群发名称" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="群发方式" prop="gradeId">
+              <el-select
+                v-model="form1.gradeId"
+                placeholder="请选择会员等级（多选）"
+                style="width: 100%"
+              >
+                <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="群发礼品" prop="carNo">
+              <el-input v-model="form1.carNo" placeholder="请输入身份证号" maxlength="30"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="短信模板" prop="cardBalance" v-if="title != '修改会员'">
+              <el-select
+                v-model="form1.gradeId"
+                placeholder="请选择会员等级（多选）"
+                style="width: 100%"
+              >
+                <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="群发会员数量">
+          200
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm1">确 定</el-button>
+        <el-button @click="openMassSend = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!--    批量录入会员信息-->
     <el-dialog :title="title" :visible.sync="openUpload" append-to-body>
       <div style="height: 60px;line-height: 30px">
-        <div> 第一步: 下载示例模板,按照模板填写会员数据,手机号为必填项 </div>
+        <div> 第一步: 下载示例模板,按照模板填写会员数据,手机号为必填项</div>
         <a style="margin-left: 50px;color: #00afff"
            href="/fuint-application/excel/export"> 会员示例模板.xlsx </a>
       </div>
@@ -403,24 +522,24 @@
           <el-button size="small" type="success" icon="el-icon-upload">点击上传</el-button>
           <div slot="tip">只能上传xls/xlsx文件，单次最大5000行会员数据且不超过1M 超出请分文件处理</div>
         </el-upload>
-<!--        <el-button type="primary" round @click="importUser">主要按钮</el-button>-->
+        <!--        <el-button type="primary" round @click="importUser">主要按钮</el-button>-->
       </div>
     </el-dialog>
 
-<!--    批量导入结果-->
+    <!--    批量导入结果-->
     <el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
       <div class="huiyuan">
-        会员总数：<span class="num">{{result.total}}</span> 人
+        会员总数：<span class="num">{{ result.total }}</span> 人
       </div>
       <div class="huiyuan">
-        成功人数：<span class="num">{{result.success}}</span> 人
+        成功人数：<span class="num">{{ result.success }}</span> 人
       </div>
       <div class="huiyuan">
-        失败人数：<span class="num">{{result.error}}</span> 人
+        失败人数：<span class="num">{{ result.error }}</span> 人
         <span v-if="result.error!=0" style="color: red;font-size: 12px">手机号不可为空</span>
       </div>
       <div class="huiyuan">
-        重复人数：<span class="num">{{result.repeat}}</span> 人
+        重复人数：<span class="num">{{ result.repeat }}</span> 人
       </div>
     </el-dialog>
 
@@ -433,54 +552,52 @@
 </template>
 
 <script>
-import { getMemberList, updateMemberStatus, getMemberInfo, saveMember, deleteMember } from "@/api/member";
+import {updateMemberStatus} from "@/api/member";
 import balanceRecharge from "./balanceRecharge";
 import pointRecharge from "./pointRecharge";
 import {
   addUser,
   delUser,
-  exportUsers,
-  getUser,
-  getUserMobile, getUserPhone,
+  getUser, getUserPhone,
   listStatistic,
-  listUser, listUserStatistic,
+  listUser, listUserStatistic, logOffUsers,
   updateUser
 } from "@/api/staff/user/user";
 import {allUserGrade, listUserGrade} from "@/api/staff/user/usergrade";
-import {ljStoreList, storesList} from "@/api/staff/store";
+import {storesList} from "@/api/staff/store";
 import {getSysConfig} from "@/api/staff/user/sysconfig";
-import { getToken } from "@/utils/auth";
-import {paymentApi} from "@/api/payment/fypay";
+import {getToken} from "@/utils/auth";
+
 export default {
   name: "MemberIndex",
-  components: { balanceRecharge, pointRecharge },
-  dicts: ['official','zhzt'],
+  components: {balanceRecharge, pointRecharge},
+  dicts: ['official', 'zhzt'],
   data() {
     return {
-      baseUrl:process.env.VUE_APP_BASE_API,
-      result:{},
+      baseUrl: process.env.VUE_APP_BASE_API,
+      result: {},
       // 是否自动上传
-      isUpload:false,
+      isUpload: false,
       headers: {
         'Access-Token': getToken(),
       },
       // 文件上传信息
       fileList: [],
 
-      addMember:[],
+      addMember: [],
       // 余额
-      balance:'',
+      balance: '',
       // 积分
-      point:'',
+      point: '',
       // 升数卡
-      literCard:'',
+      literCard: '',
       // 加油金
-      refuelMoney:'',
+      refuelMoney: '',
       // 今日新增
-      addNum:'',
+      addNum: '',
       // 昨日新增
-      yesterdayAddNum:'',
-      rechargeTotal:"",
+      yesterdayAddNum: '',
+      rechargeTotal: "",
       // 遮罩层
       loading: true,
       uploading: false,
@@ -503,7 +620,7 @@ export default {
       // 当前店铺会员等级列表
       userGradeList: [],
       // 所有等级信息
-      allUserGrade:[],
+      allUserGrade: [],
       // 店铺列表
       storeList: [],
       storeIds: [],
@@ -512,6 +629,7 @@ export default {
       openUser: false,
       openUpload: false,
       openResult: false,
+      openMassSend:false,
       // 当前操作用户
       userId: '',
       // 是否弹层充值
@@ -520,14 +638,17 @@ export default {
       openPoint: false,
       // 日期范围
       dateRange: [],
-      beginTime:"",
-      endTime:"",
+      beginTime: "",
+      endTime: "",
       // 默认排序
       defaultSort: {prop: 'updateTime', order: 'descending'},
       // 表单参数
-      form: { id: '', name: '', gradeId: '', mobile: '', userNo: '',points:0, startTime: '',
-        endTime: '', refuelMoney:'0',official:'wgz',
-        cardBalance:0, literCard:'0', sex: 1, idcard: '', birthday: '', address: '', status: "qy", description: '' },
+      form: {
+        id: '', name: '', gradeId: '', mobile: '', userNo: '', points: 0, startTime: '',
+        endTime: '', refuelMoney: '0', official: 'wgz',
+        cardBalance: 0, literCard: '0', sex: 1, idcard: '', birthday: '', address: '', status: "qy", description: ''
+      },
+      form1:{},
       // 查询参数
       queryParams: {
         page: 1,
@@ -539,21 +660,21 @@ export default {
         gradeId: '',
         status: '',
         storeId: '',
-        official:'',
-        cardBalance:'',
+        official: '',
+        cardBalance: '',
       },
-      ifBalance:'',
+      ifBalance: '',
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "会员名称不能为空", trigger: "blur" },
+          {required: true, message: "会员名称不能为空", trigger: "blur"},
           // { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
         ],
-        gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }],
-        status: [{ required: true, message: "请选择会员状态", trigger: "blur" }],
+        gradeId: [{required: true, message: "请选择会员等级", trigger: "blur"}],
+        status: [{required: true, message: "请选择会员状态", trigger: "blur"}],
         mobile: [
-          { required: true, message: "请输入手机号", trigger: "blur" },
-          { min: 11, max: 11, message: '请输入正确的手机号', trigger: 'blur' }
+          {required: true, message: "请输入手机号", trigger: "blur"},
+          {min: 11, max: 11, message: '请输入正确的手机号', trigger: 'blur'}
         ],
       }
     };
@@ -567,7 +688,7 @@ export default {
   },
   methods: {
     // 定时器
-    queryUserList(){
+    queryUserList() {
       // let _this = this;
       // setInterval(function (){
       //   _this.getList();
@@ -575,17 +696,17 @@ export default {
       // },5000)
     },
     // 跳转详情页
-    goDedi(id){
+    goDedi(id) {
       this.$router.push({
-        path:"/member/userInfo",
-        query:{
-          id:id
+        path: "/member/userInfo",
+        query: {
+          id: id
         }
       })
     },
-    getUserList(){
+    getUserList() {
       this.loading = true;
-      listUserStatistic().then( response => {
+      listUserStatistic().then(response => {
         this.userList = response.data.records;
         this.total1 = response.data.total;
         this.loading = false;
@@ -600,53 +721,53 @@ export default {
         dateRange.push(this.beginTime.toLocaleDateString())
         dateRange.push(this.endTime.toLocaleDateString())
       }
-      listUser(this.addDateRange(this.queryParams, dateRange)).then( response => {
+      listUser(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.list = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
     },
     // 获得统计信息
-    getStatistic(){
+    getStatistic() {
       let dateRange = []
       if (this.beginTime && this.endTime) {
         dateRange.push(this.beginTime.toLocaleDateString())
         dateRange.push(this.endTime.toLocaleDateString())
       }
-      listStatistic(this.addDateRange(this.queryParams, dateRange)).then( response => {
+      listStatistic(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.addNum = response.data.addNum;
         this.yesterdayAddNum = response.data.yesterdayAddNum;
         this.rechargeTotal = response.data.rechargeTotal;
         if (!response.data.balance) {
           this.balance = 0
-        }else {
+        } else {
           this.balance = response.data.balance;
         }
         if (!response.data.point) {
           this.point = 0
-        }else {
+        } else {
           this.point = response.data.point;
         }
       });
-      allUserGrade().then( response => {
+      allUserGrade().then(response => {
         this.allUserGrade = response.data
       });
-      listUserGrade({page:1,pageSize:20}).then( response => {
+      listUserGrade({page: 1, pageSize: 20}).then(response => {
         this.userGradeList = response.data.records;
       });
-      storesList().then( response => {
+      storesList().then(response => {
         this.storeList = response.data
       });
     },
     // 搜索按钮操作
     handleQuery() {
       this.queryParams.page = 1;
-      if (this.ifBalance=='haveBalance'){
+      if (this.ifBalance == 'haveBalance') {
         this.queryParams.cardBalance = 1;
-      }else {
+      } else {
         this.queryParams.cardBalance = 2;
       }
-      if (this.ifBalance==''){
+      if (this.ifBalance == '') {
         this.queryParams.cardBalance = ''
       }
       this.getList();
@@ -668,11 +789,11 @@ export default {
     // 状态修改
     handleStatusChange(row) {
       let text = row.status == "A" ? "启用" : "禁用";
-      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function() {
+      this.$modal.confirm('确认要' + text + '"' + row.name + '"吗？').then(function () {
         return updateMemberStatus(row.id, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "N" ? "A" : "N";
       });
     },
@@ -689,11 +810,11 @@ export default {
     },
     // 余额充值操作
     handleBalance(userId) {
-       this.openBalance = true;
-       this.userId = userId.toString();
+      this.openBalance = true;
+      this.userId = userId.toString();
     },
     // 导入会员信息
-    importUser(){
+    importUser() {
       this.openResult = true;
       this.title = "会员创建结果";
       this.getList();
@@ -701,16 +822,16 @@ export default {
     },
     // 积分变更操作
     handlePoint(userId) {
-       this.openPoint = true
-       this.userId = userId.toString();
+      this.openPoint = true
+      this.userId = userId.toString();
     },
     // 关闭对话框
     closeDialog(dialog) {
       if (dialog == 'balance') {
-          this.openBalance = false;
+        this.openBalance = false;
       }
       if (dialog == 'point') {
-          this.openPoint = false;
+        this.openPoint = false;
       }
       this.userId = "";
       this.getList();
@@ -724,14 +845,19 @@ export default {
     addOne() {
       this.reset();
       this.open = true;
-      this.title = "录入会员";
+      this.title = "新增会员";
     },
-    addMult(){
+    addMult() {
       this.openUpload = true;
-      this.title = "批量导入会员";
+      this.title = "批量新增会员";
+    },
+    handleMassSend(){
+      this.form1 = {}
+      this.openMassSend = true
+      this.title = "会员群发";
     },
     // 获取配置信息
-    getConfig(){
+    getConfig() {
       getSysConfig('addMember').then(response => {
         this.addMember = response.data.split(";")
       });
@@ -739,9 +865,25 @@ export default {
     // 表单重置
     reset() {
       this.resetForm("form");
-      this.form= { id: '', name: '', gradeId: '', mobile: '', userNo: '',points:0, startTime: '', endTime: '',
-        refuelMoney:'0',official:'wgz',cardBalance:0, literCard:'0', sex: 1, idcard: '', birthday: '', address: '',
-        status: "qy", description: ''
+      this.form = {
+        id: '',
+        name: '',
+        gradeId: '',
+        mobile: '',
+        userNo: '',
+        points: 0,
+        startTime: '',
+        endTime: '',
+        refuelMoney: '0',
+        official: 'wgz',
+        cardBalance: 0,
+        literCard: '0',
+        sex: 1,
+        idcard: '',
+        birthday: '',
+        address: '',
+        status: "qy",
+        description: ''
       }
     },
     // 取消按钮
@@ -750,30 +892,30 @@ export default {
       this.reset();
     },
     // 提交按钮
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id) {
             updateUser(this.form).then(response => {
-              if (response.data==1){
+              if (response.data == 1) {
                 this.$modal.msgSuccess("修改会员成功");
                 this.open = false;
                 this.getList();
-              }else {
+              } else {
                 this.$modal.msgError("手机号已存在");
               }
             });
           } else {
-            getUserPhone({mobile:this.form.mobile}).then( response => {
-              if(response.data){
+            getUserPhone({mobile: this.form.mobile}).then(response => {
+              if (response.data) {
                 this.$modal.msgError("手机号已存在");
-              }else {
+              } else {
                 addUser(this.form).then(res => {
-                    this.$modal.msgSuccess("新增会员成功");
-                    this.open = false;
-                    this.openUser = false;
-                    this.getList();
-                    this.getUserList();
+                  this.$modal.msgSuccess("新增会员成功");
+                  this.open = false;
+                  this.openUser = false;
+                  this.getList();
+                  this.getUserList();
 
                 });
               }
@@ -782,6 +924,14 @@ export default {
         }
       });
     },
+    // 提交按钮
+    submitForm1: function () {
+      this.$refs["form1"].validate(valid => {
+        if (valid) {
+
+        }
+      });
+    },
     // 修改按钮操作
     handleUpdate(row) {
       this.reset();
@@ -789,29 +939,42 @@ export default {
       getUser(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑会员";
+        this.title = "修改会员";
       });
     },
     // 删除按钮操作
     handleDelete(row) {
       const name = row.name
-      this.$modal.confirm('确定删除"' + name + '"的会员信息？').then(function() {
+      this.$modal.confirm('是否删除本条数据，删除后无法恢复').then(function () {
         // return deleteMember(row.id);
         return delUser(row.id);
       }).then(() => {
         this.queryParams.page = 1
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
+    },
+    // 注销按钮操作
+    handleLogOff(row) {
+      const name = row.name
+      this.$modal.confirm('是否注销本会员数据，注销后无法恢复').then(function () {
+        return logOffUsers(row.balanceId);
+      }).then(() => {
+        this.queryParams.page = 1
+        this.getList();
+        this.$modal.msgSuccess("注销成功");
+      }).catch(() => {
+      });
     },
     handleChange(file, fileList) {
       this.uploading = true;
-      if(file.status === 'success'){
+      if (file.status === 'success') {
         this.uploading = false;
         this.openUpload = false;
         this.openUser = false;
         this.importUser();
-        this.fileList.splice(0,1)
+        this.fileList.splice(0, 1)
         this.result = file.response.data
       }
     },
@@ -821,102 +984,113 @@ export default {
 
 <style scoped lang="scss">
 
-  .app-container{
-    width: 100%;
-    height: 100%;
-    background: #f6f8f9;
-  }
-  .sta{
-    height: 100px;
-    margin-top: 10px;
-    background: #f6f8f9;
-    padding-top: 30px;
-  }
-  .huiyuan{
-    height: 30px;
-    line-height: 30px;
-    font-size: 16px;
-  }
-  .num{
-    font-weight: bold;
-    color: red;
-    font-size: 18px;
-  }
-  .ds-dbox{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    box-sizing: border-box;
-    padding: 15px;
-  }
-  .k-one{
-    width: 19%;
-    border-radius: 10px;
-    border: 1px solid #F5DF1A;
-    background: rgba(252,238,109,0.1);
-    box-sizing: border-box;
-    padding: 20px;
-    position: relative;
-    overflow: hidden;
-  }
-  .k-two{
-    width: 19%;
-    border-radius: 10px;
-    border: 1px solid #0ECB98;
-    background:rgba(14, 203, 152, 0.10);
-    box-sizing: border-box;
-    padding: 20px;
-    position: relative;
-    overflow: hidden;
-  }
-  .k-three{
-    width: 19%;
-    border-radius: 10px;
-    border: 1px solid #409EFF;
-    background: rgba(64,158,255,0.1);
-    box-sizing: border-box;
-    padding: 20px;
-    position: relative;
-    overflow: hidden;
-  }
-  .k-four{
-    width: 19%;
-    border-radius: 10px;
-    border: 1px solid #FF8E8D;
-    background: rgba(255,142,141,0.1);
-    box-sizing: border-box;
-    padding: 20px;
-    position: relative;
-    overflow: hidden;
-  }
-  .k-five{
-    width: 19%;
-    border-radius: 10px;
-    border: 1px solid #647CFF;
-    background: rgba(100,124,255,0.1);
-    box-sizing: border-box;
-    padding: 20px;
-    position: relative;
-    overflow: hidden;
-  }
-  .r-bot-img{
-    position: absolute;
-    bottom: 5px;
-    right: 5px;
-    width:54px;
-    height: 50px;
+.app-container {
+  width: 100%;
+  height: 100%;
+  background: #f6f8f9;
+}
 
-  }
+.sta {
+  height: 100px;
+  margin-top: 10px;
+  background: #f6f8f9;
+  padding-top: 30px;
+}
 
-  .title_{
-    font-weight: 400;
-    font-size: 14px;
-    color: #999999;
-    margin-bottom: 10px;
-  }
-  .num-size{
-    font-size: 28px;
-    color: #333333;
-    font-weight: bold;
-  }
+.huiyuan {
+  height: 30px;
+  line-height: 30px;
+  font-size: 16px;
+}
+
+.num {
+  font-weight: bold;
+  color: red;
+  font-size: 18px;
+}
+
+.ds-dbox {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 15px;
+}
+
+.k-one {
+  width: 19%;
+  border-radius: 10px;
+  border: 1px solid #F5DF1A;
+  background: rgba(252, 238, 109, 0.1);
+  box-sizing: border-box;
+  padding: 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.k-two {
+  width: 19%;
+  border-radius: 10px;
+  border: 1px solid #0ECB98;
+  background: rgba(14, 203, 152, 0.10);
+  box-sizing: border-box;
+  padding: 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.k-three {
+  width: 19%;
+  border-radius: 10px;
+  border: 1px solid #409EFF;
+  background: rgba(64, 158, 255, 0.1);
+  box-sizing: border-box;
+  padding: 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.k-four {
+  width: 19%;
+  border-radius: 10px;
+  border: 1px solid #FF8E8D;
+  background: rgba(255, 142, 141, 0.1);
+  box-sizing: border-box;
+  padding: 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.k-five {
+  width: 19%;
+  border-radius: 10px;
+  border: 1px solid #647CFF;
+  background: rgba(100, 124, 255, 0.1);
+  box-sizing: border-box;
+  padding: 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.r-bot-img {
+  position: absolute;
+  bottom: 5px;
+  right: 5px;
+  width: 54px;
+  height: 50px;
+
+}
+
+.title_ {
+  font-weight: 400;
+  font-size: 14px;
+  color: #999999;
+  margin-bottom: 10px;
+}
+
+.num-size {
+  font-size: 28px;
+  color: #333333;
+  font-weight: bold;
+}
 </style>
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index 115c15a50..cf689ed4e 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -50,9 +50,21 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="groupName" label="分组名称" width="180"></el-table-column>
-          <el-table-column prop="remark" label="备注" width="180"></el-table-column>
-          <el-table-column prop="address" label="会员数量"></el-table-column>
-          <el-table-column prop="address" label="会员占比"></el-table-column>
+          <el-table-column prop="remark" label="备注" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark || "--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="会员数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="会员占比">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark || 0 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="status" label="状态">
             <template slot-scope="scope">
               <el-switch
@@ -64,7 +76,11 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="accountName" label="创建人"></el-table-column>
+          <el-table-column prop="accountName" label="创建人">
+            <template slot-scope="scope">
+              <span>{{ scope.row.accountName || "--" }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="创建时间"></el-table-column>
           <el-table-column prop="updateTime" label="更新时间"></el-table-column>
           <el-table-column align="center" label="操作" width="120">
@@ -97,9 +113,9 @@
       <div>
         <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="120px">
 
-          <el-form-item label="" prop="groupName" style="width: 180px">
+          <el-form-item label="" prop="name" style="width: 180px">
             <el-input
-              v-model="queryParams1.groupName"
+              v-model="queryParams1.name"
               placeholder="请输入活动名称"
               clearable
               @keyup.enter.native="handleQuery"
@@ -121,9 +137,9 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item style="float: right">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            <el-button type="primary" @click="handleAdd">新增定时群发</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
+            <el-button type="primary" @click="handleAdd1">新增定时群发</el-button>
           </el-form-item>
 
         </el-form>
@@ -136,11 +152,31 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="name" label="活动名称" width="180"></el-table-column>
-          <el-table-column prop="activityTime" label="活动时间" width="180"></el-table-column>
-          <el-table-column prop="sendFrequency" label="发送频次"></el-table-column>
-          <el-table-column prop="address" label="群发会员"></el-table-column>
+          <el-table-column prop="activityTimeType" label="活动时间" width="190">
+            <template slot-scope="scope">
+              <span v-if="scope.row.activityTimeType==0">永久有效</span>
+              <span v-else>{{ scope.row.activityTimeFront }} ~ {{ scope.row.activityTimeAfter }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="sendFrequency" label="发送频次">
+            <template slot-scope="scope">
+              <span v-if="scope.row.sendFrequency==0">每天一次</span>
+              <span v-if="scope.row.sendFrequency==1">周固定时间</span>
+              <span v-if="scope.row.sendFrequency==2">月固定时间</span>
+              <span v-if="scope.row.sendFrequency==3">法定节日时间</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="sendUserNum" label="群发会员">
+            <template slot-scope="scope">
+              <span>{{ scope.row.sendUserNum || 0 }}</span>
+            </template>
+          </el-table-column>
 
-          <el-table-column prop="senfGift" label="群发礼品"></el-table-column>
+          <el-table-column prop="senfGift" label="群发礼品">
+            <template slot-scope="scope">
+              <span>{{ scope.row.senfGift || "--" }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="status" label="活动状态">
             <template slot-scope="scope">
               <div v-if="scope.row.status == 0" style="color: #FF7E00">未开始</div>
@@ -156,13 +192,13 @@
                 size="mini"
                 type="text"
                 v-if="scope.row.status == 0"
-                @click="handleUpdate(scope.row)"
+                @click="handleUpdate1(scope.row)"
               >修改
               </el-button>
               <el-button
                 size="mini"
                 type="text"
-                @click="handleDelete(scope.row)"
+                @click="handleDelete1(scope.row)"
               >删除
               </el-button>
             </template>
@@ -178,7 +214,7 @@
       />
     </div>
     <div class="cot-box" v-if="tabindex==2">
-      <div >
+      <div>
         <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="120px">
 
           <el-form-item label="" prop="groupName" style="width: 180px">
@@ -216,20 +252,49 @@
           border
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="activityName" label="活动名称" width="180"> </el-table-column>
-          <el-table-column prop="sendGift" label="群发礼品" width="180"> </el-table-column>
-          <el-table-column prop="sendWay" label="群发方式"> </el-table-column>
-          <el-table-column prop="address" label="群发内容"> </el-table-column>
+          <el-table-column prop="activityName" label="活动名称" width="180"></el-table-column>
+          <el-table-column prop="sendGift" label="群发礼品"></el-table-column>
+          <el-table-column prop="sendWay" label="群发方式"></el-table-column>
+          <el-table-column prop="massContent" label="群发内容" width="220"></el-table-column>
 
-          <el-table-column prop="userNum" label="群发会员数量"> </el-table-column>
-          <el-table-column prop="successNum" label="成功数量"> </el-table-column>
-          <el-table-column prop="failNum" label="失败数量"> </el-table-column>
-          <el-table-column prop="status" label="状态"> </el-table-column>
-          <el-table-column prop="address" label="已领取数量"> </el-table-column>
-          <el-table-column prop="address" label="已核销数量"> </el-table-column>
-          <el-table-column prop="address" label="未核销数量"> </el-table-column>
-          <el-table-column prop="accountName" label="操作人员"> </el-table-column>
-          <el-table-column prop="createTime" label="群发时间"> </el-table-column>
+          <el-table-column prop="userNum" label="群发会员数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.userNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="successNum" label="成功数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.successNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="failNum" label="失败数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.failNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="状态">
+            <template slot-scope="scope">
+              <div v-if="scope.row.status == 0" style="color: #0DC291">已发送</div>
+              <div v-if="scope.row.status == 1" style="color: #F44522">发送失败</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="已领取数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.userNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="已核销数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.userNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="未核销数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.userNum || 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="accountName" label="操作人员"></el-table-column>
+          <el-table-column prop="createTime" label="群发时间" width="160"></el-table-column>
           <el-table-column align="center" label="操作" width="120">
             <template slot-scope="scope">
               <el-button
@@ -253,85 +318,105 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
-        <el-form-item label="分组名称" prop="labelName">
-          <el-input v-model="form.labelName" placeholder="请输入分组名称" maxlength="30"/>
+        <el-form-item label="分组名称" prop="groupName">
+          <el-input v-model="form.groupName" placeholder="请输入分组名称" maxlength="30"/>
         </el-form-item>
 
-        <el-form-item label="会员等级" prop="paymentType">
-          <el-select v-model="form.paymentType" placeholder="请选择会员等级" style="width: 100%">
-            <el-option label="现金" value="CASH"></el-option>
+        <el-form-item label="会员等级" prop="gradeId">
+          <el-select v-model="form.gradeId" placeholder="请选择会员等级" style="width: 100%">
+            <el-option v-for="(item,index) in userGradeList" :key="index" :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员标签" prop="paymentType">
-          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
-            <el-option label="现金" value="CASH"></el-option>
+        <el-form-item label="会员标签" prop="userLabelId">
+          <el-select v-model="form.userLabelId" multiple placeholder="请选择会员标签（多选）" style="width: 100%">
+            <el-option v-for="(item,index) in userLabelList" :key="index" :label="item.labelName"
+                       :value="item.id+''"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员性别" prop="paymentType">
-<!--          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">-->
-<!--            <el-option label="现金" value="CASH"></el-option>-->
-<!--          </el-select>-->
-          <div class="d-s">
-            <div class="icon-type" v-for="(item,index) in paymentTypelist" :key="index" :class="{ 'acvtive' : index === tindex }" @click="Typeindex(index)" >
-              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex" >
-              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex" >
-              {{item}}</div>
-          </div>
+        <el-form-item label="会员性别" prop="userSex">
+          <el-checkbox-group v-model="form.userSex">
+            <el-checkbox type="name" label="男"></el-checkbox>
+            <el-checkbox type="name" label="女"></el-checkbox>
+            <el-checkbox type="name" label="不详"></el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
         <el-form-item label="会员年龄" prop="paymentType">
           <div class="d-s">
-            <el-input placeholder="请输入年龄" v-model="input"  style="width: 190px"></el-input>
+            <el-input placeholder="请输入年龄" v-model="form.userAgeFront" style="width: 190px"></el-input>
             <div style="margin: 0 15px">至</div>
-            <el-input placeholder="请输入年龄" v-model="input" style="width: 190px"></el-input>
+            <el-input placeholder="请输入年龄" v-model="form.userAgeAfter" style="width: 190px"></el-input>
           </div>
         </el-form-item>
         <el-form-item label="会员余额" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入余额" v-model="form.userBalanceFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入余额" v-model="form.userBalanceAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="会员积分" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入积分" v-model="form.userPointFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入积分" v-model="form.userPointAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="充值次数" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入充值次数" v-model="form.rechargeNumFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入充值次数" v-model="form.rechargeNumAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="充值金额" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入充值金额" v-model="form.rechargeAmountFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入充值金额" v-model="form.rechargeAmountAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
-        <el-form-item label="消费周期" prop="paymentType">
-          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
-            <el-option label="现金" value="CASH"></el-option>
-          </el-select>
+        <el-form-item label="消费周期" prop="consumeCycle">
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in paymentTypelist" :key="index"
+                 :class="{ 'acvtive' : index === tindex }" @click="Typeindex(index)">
+              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
+              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
+              {{ item }}
+            </div>
+          </div>
         </el-form-item>
-        <el-form-item label="消费油品" prop="paymentType">
-          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
-            <el-option label="现金" value="CASH"></el-option>
+        <el-form-item label="消费油品" prop="consumeOil">
+          <el-select v-model="form.consumeOil" multiple placeholder="请选择油品（多选）" style="width: 100%">
+            <el-option v-for="(item,index) in oilNumberList" :key="index"
+                       :label="getOilNamess(oilNameList,item.oilName)" :value="item.oilName"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="消费次数" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入消费次数" v-model="form.consumeNumFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入消费次数" v-model="form.consumeNumAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="消费金额" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入消费金额" v-model="form.consumeAmountFront" style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入消费金额" v-model="form.consumeAmountAfter" style="width: 190px"></el-input>
+          </div>
         </el-form-item>
         <el-form-item label="平均消费" prop="paymentType">
-          <el-input placeholder="请输入内容" v-model="form.age">
-            <template slot="append">.com</template>
-          </el-input>
+          <div class="d-s">
+            <el-input placeholder="请输入平均消费金额" v-model="form.averageConsumeFront"
+                      style="width: 190px"></el-input>
+            <div style="margin: 0 15px">至</div>
+            <el-input placeholder="请输入平均消费金额" v-model="form.averageConsumeAfter"
+                      style="width: 190px"></el-input>
+          </div>
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
@@ -344,7 +429,7 @@
           </el-switch>
         </el-form-item>
 
-        <el-form-item label="备注" >
+        <el-form-item label="备注">
           <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>
         </el-form-item>
 
@@ -355,21 +440,153 @@
       </div>
     </el-dialog>
 
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open1" width="35%" append-to-body>
+      <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
+
+        <el-form-item label="活动名称" prop="name">
+          <el-input v-model="form1.name" placeholder="请输入活动名称" maxlength="30"/>
+        </el-form-item>
+
+        <el-form-item label="群发会员" prop="userGroupId">
+          <el-select v-model="form1.userGroupId" placeholder="请选择群发会员" style="width: 100%">
+            <el-option v-for="(item,index) in groupList" :key="index" :label="item.groupName" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="activityTimeType">
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in activityTimeTypeList" :key="index"
+                 :class="{ 'acvtive' : index === tindex1 }" @click="Typeindex1(index)">
+              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
+              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
+              {{ item }}
+            </div>
+            <el-date-picker
+              v-model="form1.activityTimeFront"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            至
+            <el-date-picker
+              v-model="form1.activityTimeAfter"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item label="发送频次" prop="sendFrequency">
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in sendFrequencyList" :key="index"
+                 :class="{ 'acvtive' : index === tindex2 }" @click="Typeindex2(index)">
+              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex2">
+              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex2">
+              {{ item }}
+            </div>
+          </div>
+          <div>
+            <el-checkbox-group v-model="weekDay" v-if="form1.sendFrequency==1">
+              <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+            </el-checkbox-group>
+            <el-checkbox-group v-model="monthDay" v-if="form1.sendFrequency==2">
+              <el-checkbox v-for="item in 31" :key="item" :label="item+''">{{ item }}日</el-checkbox>
+            </el-checkbox-group>
+            <el-time-picker
+              v-model="form1.sendTime"
+              format="HH:mm"
+              placeholder="请选择发送时间点">
+            </el-time-picker>
+          </div>
+        </el-form-item>
+        <el-form-item label="群发方式" prop="sendWay">
+          <div style="display: flex">
+            <el-checkbox-group v-model="form1.sendWay">
+              <el-checkbox label="短信消息"></el-checkbox>
+            </el-checkbox-group>
+            <el-tooltip class="item" effect="light" content="仅对有手机号的会员进行群发" placement="right">
+              <img style="width: 16px;height: 16px;margin-top: 9px;margin-left: 10px" src="@/assets/images/wenhao.png">
+            </el-tooltip>
+          </div>
+        </el-form-item>
+        <el-form-item label="群发礼品" prop="senfGift">
+          <el-checkbox-group v-model="form1.senfGift">
+            <el-checkbox label="积分"></el-checkbox>
+            <el-checkbox label="优惠券"></el-checkbox>
+            <el-checkbox label="成长值"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="短信模板" prop="messageId">
+          <el-select v-model="form1.messageId" placeholder="请选择短信模板名称" style="width: 100%">
+            <el-option v-for="(item,index) in messageList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="跳转链接" prop="jumpLink">
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in jumpLinkList" :key="index"
+                 :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
+              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
+              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
+              {{ item }}
+            </div>
+          </div>
+          <el-select v-if="form1.jumpLink==0" v-model="form1.appletJumpPage" placeholder="请选择跳转页面"
+                     style="width: 100%">
+            <el-option v-for="(item,index) in jumpPageList" :key="index" :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="会员数量">
+          {{ form1.sendUserNum }}
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm1">确 定</el-button>
+        <el-button @click="cancel1">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
 import {addUserGroup, deleteUserGroup, editUserGroup, getUserGroup, listUserGroup} from "@/api/userGroup/usergroup";
-import {listUserMassSend} from "@/api/userGroup/userMassSend";
+import {
+  addUserMassSend,
+  deleteUserMassSend,
+  editUserMassSend,
+  getUserMassSend,
+  listUserMassSend
+} from "@/api/userGroup/userMassSend";
 import {listUserMassSendRecord} from "@/api/userGroup/userMassSendRecord";
+import {listUserLabel} from "@/api/staff/user/userlabel";
+import {listUserGrade} from "@/api/staff/user/usergrade";
+import {getOilNameList, oilNumberList} from "@/api/order/oilnumgun";
+import {getListApi} from "@/api/setting/message";
 
 export default {
   data() {
     return {
       tabindex: 0,
-        tindex: 0,
-      paymentTypelist:[
-        "全部", "男", "女","不详",
+      tindex: 0,
+      tindex1: 0,
+      tindex2: 0,
+      tindex3: 0,
+      paymentTypelist: [
+        "不限制", "7天", "15天", "30天", "60天", "90天", "180天",
       ],
+      activityTimeTypeList: [
+        "永久有效", "自定义"
+      ],
+      sendFrequencyList: [
+        "每天一次", "周固定时间", "月固定时间", "法定节日时间"
+      ],
+      jumpLinkList: [
+        "小程序链接", "常用链接"
+      ],
+      weekList: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+      weekDay: [],
+      monthDay: [],
       tableData: [{
         status: 0,
         date: '2016-05-02',
@@ -404,6 +621,7 @@ export default {
           name: "群发记录",
         }
       ],
+
       total: 0,
       queryParams: {
         page: 1,
@@ -412,6 +630,7 @@ export default {
       beginTime: "",
       endTime: "",
       userGroupList: [],
+
       total1: 0,
       queryParams1: {
         page: 1,
@@ -420,6 +639,7 @@ export default {
       beginTime1: "",
       endTime1: "",
       massSendList: [],
+
       total2: 0,
       queryParams2: {
         page: 1,
@@ -428,24 +648,138 @@ export default {
       beginTime2: "",
       endTime2: "",
       massSendRecordList: [],
-      title:'',
-      open:false,
-      form:{},
+
+      title: '',
+      open: false,
+      form: {userSex: []},
+      userLabelList: [],
+      userGradeList: [],
+      oilNameList: [],
+      // 油号列表
+      oilNumberList: [],
+
+      open1: false,
+      form1: {userSex: []},
+      messageList: [],
+      jumpPageList: [
+        {id: 0, name: "首页"},
+        {id: 1, name: "一键加油"},
+        {id: 2, name: "储值卡充值"},
+        {id: 3, name: "囤油卡充值"},
+        {id: 4, name: "礼品卡兑换"},
+        {id: 5, name: "消费有礼"},
+        {id: 6, name: "折扣营销"},
+        {id: 7, name: "满减营销"},
+        {id: 8, name: "积分商城"},
+        {id: 9, name: "邀请有礼"},
+      ],
+      groupList:[],
+
       // 表单校验
       rules: {
-        labelName: [
-          {required: true, message: "标签名称不能为空", trigger: "blur"},
+        groupName: [
+          {required: true, message: "分组名称不能为空", trigger: "blur"},
         ],
         status: [
           {required: true, message: "状态不能为空", trigger: "blur"}
-        ]
+        ],
+        name: [
+          {required: true, message: "活动名称不能为空", trigger: "blur"}
+        ],
+        userGroupId: [
+          {required: true, message: "群发会员不能为空", trigger: "blur"}
+        ],
+        activityTimeType: [
+          {required: true, message: "活动时间不能为空", trigger: "blur"}
+        ],
+        sendFrequency: [
+          {required: true, message: "发送频次不能为空", trigger: "blur"}
+        ],
+        sendWay: [
+          {required: true, message: "群发方式不能为空", trigger: "blur"}
+        ],
+        senfGift: [
+          {required: true, message: "群发礼品不能为空", trigger: "blur"}
+        ],
+        messageId: [
+          {required: true, message: "短信模板不能为空", trigger: "blur"}
+        ],
       }
     };
   },
   created() {
     this.getList()
+    this.getUserLabelList()
   },
   methods: {
+    getUserLabelList() {
+      listUserLabel({page: 1, pageSize: 10, status: 'qy'}).then(res => {
+        this.userLabelList = res.data.records
+      })
+      listUserGrade({page: 1, pageSize: 20}).then(response => {
+        this.userGradeList = response.data.records;
+      });
+      getOilNameList().then(response => {
+        this.oilNameList = response.data;
+      })
+      oilNumberList().then(response => {
+        this.oilNumberList = response.data.records;
+      })
+    },
+    getMessageList() {
+      getListApi({page: 1, pageSize: 10000, status: '1'}).then(res => {
+        this.messageList = res.data.records;
+      })
+
+      listUserGroup({page: 1, pageSize: 10000, status: 'qy'}).then(res => {
+        this.groupList = res.data.records
+      })
+    },
+    getOilNamess(list, id) {
+      let name = ""
+      if (list != null && list != "") {
+        list.forEach(item => {
+          if (item.id == id) {
+            name = item.oilName;
+          }
+        })
+      }
+      return name;
+    },
+    // 取消按钮
+    cancel1() {
+      this.open1 = false;
+      this.reset();
+    },
+    // 提交按钮
+    submitForm1: function () {
+      this.$refs["form1"].validate(valid => {
+        if (valid) {
+          this.form1.sendWay = this.form1.sendWay.toString()
+          this.form1.senfGift = this.form1.senfGift.toString()
+          if (this.form1.sendFrequency==1){
+            if (this.weekDay.length>0) this.form1.sendDate = this.weekDay.toString()
+          }else if (this.form1.sendFrequency==2){
+            if (this.monthDay.length>0) this.form1.sendDate = this.monthDay.toString()
+          }
+          if (!this.form1.id) {
+            addUserMassSend(this.form1).then(res => {
+              this.$message.success("添加成功")
+              this.open1 = false
+              this.queryParams1.page = 1;
+              this.getList1()
+            })
+          } else {
+            editUserMassSend(this.form1).then(res => {
+              this.$message.success("修改成功")
+              this.open1 = false
+              this.queryParams1.page = 1;
+              this.getList1()
+            })
+          }
+        }
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -455,6 +789,9 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.form.userSex) this.form.userSex = this.form.userSex.toString()
+          if (this.form.userLabelId) this.form.userLabelId = this.form.userLabelId.toString()
+          if (this.form.consumeOil) this.form.consumeOil = this.form.consumeOil.toString()
           if (!this.form.id) {
             addUserGroup(this.form).then(res => {
               this.$message.success("添加成功")
@@ -473,8 +810,21 @@ export default {
         }
       });
     },
-    Typeindex(index){
+    Typeindex(index) {
       this.tindex = index
+      this.form.consumeCycle = index
+    },
+    Typeindex1(index) {
+      this.tindex1 = index
+      this.form1.activityTimeType = index
+    },
+    Typeindex2(index) {
+      this.tindex2 = index
+      this.form1.sendFrequency = index
+    },
+    Typeindex3(index) {
+      this.tindex3 = index
+      this.form1.jumpLink = index
     },
     getList() {
       let dateRange = []
@@ -515,7 +865,35 @@ export default {
       getUserGroup(row.id).then(res => {
         this.open = true;
         this.form = res.data;
-        this.title = "修改会员标签"
+        if (res.data.userSex) {
+          this.form.userSex = res.data.userSex.split(",")
+        } else {
+          this.form.userSex = []
+        }
+        if (res.data.userLabelId) this.form.userLabelId = res.data.userLabelId.split(",")
+        if (res.data.consumeOil) this.form.consumeOil = res.data.consumeOil.split(",")
+        if (res.data.consumeCycle) this.tindex = res.data.consumeCycle
+        this.title = "修改会员分组"
+      })
+    },
+    // 修改按钮操作
+    handleUpdate1(row) {
+      getUserMassSend(row.id).then(res => {
+        this.open1 = true;
+        this.form1 = res.data;
+        if (res.data.sendDate){
+          if (res.data.sendFrequency==1) {
+            this.weekDay = res.data.sendDate.split(",")
+          }else if (res.data.sendFrequency==2){
+            this.monthDay = res.data.sendDate.split(",")
+          }
+        }else {
+          this.monthDay = []
+          this.weekDay = []
+        }
+        this.form1.sendWay = res.data.sendWay.split(",")
+        this.form1.senfGift = res.data.senfGift.split(",")
+        this.title = "修改定时群发"
       })
     },
     // 表单重置
@@ -534,16 +912,63 @@ export default {
       }).catch(() => {
       });
     },
+    // 删除按钮操作
+    handleDelete1(row) {
+      const name = row.labelName || this.id;
+      this.$modal.confirm('是否删除本条数据，删除后无法恢复！').then(function () {
+        return deleteUserMassSend(row.id);
+      }).then(() => {
+        this.queryParams1.page = 1
+        this.getList1();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    // 新增按钮操作
+    handleAdd1() {
+      this.tindex1 = 0
+      this.tindex2 = 0
+      this.tindex3 = 0
+      this.form1 = {
+        sendWay: [],
+        senfGift: [],
+        activityTimeType:this.tindex1,
+        sendFrequency:this.tindex2,
+        jumpLink:this.tindex3,
+      }
+      this.monthDay = []
+      this.weekDay = []
+      this.open1 = true;
+      this.title = "新增定时群发";
+    },
     // 新增按钮操作
     handleAdd() {
+      this.tindex = 0
       this.reset();
       this.form = {
-        status: "qy"
+        status: "qy",
+        userSex: [],
+        consumeCycle: this.tindex
       }
       this.open = true;
       this.title = "新增会员标签";
     },
     // 搜索按钮操作
+    handleQuery1() {
+      this.queryParams1.page = 1;
+      this.getList1();
+    },
+    // 重置按钮操作
+    resetQuery1() {
+      this.queryParams1 = {
+        page: 1,
+        pageSize: 10,
+      }
+      this.beginTime1 = ''
+      this.endTime1 = ''
+      this.handleQuery1();
+    },
+    // 搜索按钮操作
     handleQuery() {
       this.queryParams.page = 1;
       this.getList();
@@ -561,11 +986,13 @@ export default {
     },
     getindex(index) {
       this.tabindex = index
-      if (index==0){
+      if (index == 0) {
         this.getList()
-      }else if (index==1){
+        this.getUserLabelList()
+      } else if (index == 1) {
         this.getList1()
-      }else if (index==2){
+        this.getMessageList()
+      } else if (index == 2) {
         this.getList2()
       }
     }
@@ -629,7 +1056,8 @@ export default {
   display: flex;
   align-items: center;
 }
-.icon-type{
+
+.icon-type {
   display: flex;
   align-items: center;
   font-weight: 400;
@@ -638,7 +1066,8 @@ export default {
   margin-right: 20px;
   cursor: pointer;
 }
-.acvtive{
+
+.acvtive {
   color: #FF770F !important;
 }
 </style>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/controller/UserMassSendController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/controller/UserMassSendController.java
index 1585d254b..d6f64911b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/controller/UserMassSendController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/controller/UserMassSendController.java
@@ -9,6 +9,10 @@ import com.fuint.framework.web.ResponseObject;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 油机汽机配置(UserMassSend)表控制层
@@ -84,5 +88,26 @@ public class UserMassSendController extends BaseController {
         return getSuccessResult(userMassSendService.deleteById(id));
     }
 
+    @GetMapping("getLegalDate")
+    public ResponseObject getLegalDate(){
+        int year = 2023; // 你可以根据需要更改年份
+        String holidaysString = getChineseHolidaysAPI(year);
+        List<String> holidays = Arrays.asList(holidaysString.split(","));
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        for (String holiday : holidays) {
+            // 对于每个假日，你需要决定具体日期，这里我们只是打印出来
+            System.out.println(holiday + " - " + formatter.format(LocalDate.now()));
+            // 具体日期的规则可能因为假日而变化，需要你根据实际情况来确定
+        }
+        return getSuccessResult(holidays);
+    }
+
+    // 假设的API，返回节假日列表的字符串
+    public String getChineseHolidaysAPI(int year) {
+        // 这里应该是对外部API的调用，例如：httpClient.get("api.example.com/holidays?year=" + year)
+        // 现在我们使用硬编码的字符串来模拟API响应
+        return "元旦,春节,清明节,劳动节,端午节,中秋节,国庆节";
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java
index 0cb5a256f..97fdc49d7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSend.java
@@ -3,6 +3,7 @@ package com.fuint.business.userGroup.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -52,7 +53,13 @@ public class UserMassSend extends BaseEntity implements Serializable {
     /**
      * 活动时间
      */
-    private Date activityTime;
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date activityTimeFront;
+    /**
+     * 活动时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date activityTimeAfter;
     /**
      * 发送频次：0、每天一次；1、周固定时间；2、月固定时间；3、法定节日时间
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
index c1cef5066..69f38bf8e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
@@ -3,9 +3,10 @@
 <mapper namespace="com.fuint.business.userGroup.mapper.UserMassSendRecordMapper">
 
     <select id="queryPage" resultType="com.fuint.business.userGroup.vo.UserMassSendRecordVo">
-        SELECT umsr.*,ums.`name` activityName,ta.real_name accountName FROM user_mass_send_record umsr
-            LEFT JOIN user_mass_send ums on umsr.mass_send_id = ums.id
-            LEFT JOIN t_account ta on umsr.create_by = ta.acct_id
+        SELECT umsr.*,ums.`name` activityName,ta.real_name accountName,mt.content massContent FROM user_mass_send_record umsr
+        LEFT JOIN user_mass_send ums on umsr.mass_send_id = ums.id
+        LEFT JOIN message_template mt on ums.message_id = mt.id
+        LEFT JOIN t_account ta on umsr.create_by = ta.acct_id
         <where>
             <if test="entity.chainStoreId != null and entity.chainStoreId != ''">
                 and umsr.chain_store_id = #{entity.chainStoreId}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserGroupServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserGroupServiceImpl.java
index 0b2a05831..196d0b288 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserGroupServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserGroupServiceImpl.java
@@ -7,6 +7,8 @@ import com.fuint.business.userGroup.entity.UserGroup;
 import com.fuint.business.userGroup.mapper.UserGroupMapper;
 import com.fuint.business.userGroup.service.UserGroupService;
 import com.fuint.business.userGroup.vo.UserGroupVo;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,6 +22,8 @@ public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper,UserGroup>
 
     @Override
     public IPage<UserGroupVo> queryPage(Page page, UserGroupVo userGroup) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        userGroup.setStoreId(nowAccountInfo.getStoreId());
         return baseMapper.queryPage(page,userGroup);
     }
 
@@ -42,6 +46,9 @@ public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper,UserGroup>
      */
     @Override
     public int insert(UserGroup userGroup) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        userGroup.setStoreId(nowAccountInfo.getStoreId());
+        userGroup.setChainStoreId(nowAccountInfo.getChainStoreId());
         return baseMapper.insert(userGroup);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendRecordServiceImpl.java
index 6f9a237ad..50def3318 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendRecordServiceImpl.java
@@ -7,6 +7,8 @@ import com.fuint.business.userGroup.entity.UserMassSendRecord;
 import com.fuint.business.userGroup.mapper.UserMassSendRecordMapper;
 import com.fuint.business.userGroup.service.UserMassSendRecordService;
 import com.fuint.business.userGroup.vo.UserMassSendRecordVo;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -21,6 +23,8 @@ public class UserMassSendRecordServiceImpl extends ServiceImpl<UserMassSendRecor
 
     @Override
     public IPage<UserMassSendRecordVo> queryPage(Page page, UserMassSendRecordVo userMassSendRecordVo) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        userMassSendRecordVo.setStoreId(nowAccountInfo.getStoreId());
         return baseMapper.queryPage(page,userMassSendRecordVo);
     }
 
@@ -43,6 +47,9 @@ public class UserMassSendRecordServiceImpl extends ServiceImpl<UserMassSendRecor
      */
     @Override
     public int insert(UserMassSendRecord userMassSendRecord) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        nowAccountInfo.setStoreId(nowAccountInfo.getStoreId());
+        nowAccountInfo.setChainStoreId(nowAccountInfo.getChainStoreId());
         return baseMapper.insert(userMassSendRecord);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendServiceImpl.java
index 8560fc7d6..e6bba490f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/service/impl/UserMassSendServiceImpl.java
@@ -4,11 +4,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.userGroup.entity.UserMassSend;
+import com.fuint.business.userGroup.entity.UserMassSendRecord;
 import com.fuint.business.userGroup.mapper.UserMassSendMapper;
+import com.fuint.business.userGroup.service.UserMassSendRecordService;
 import com.fuint.business.userGroup.service.UserMassSendService;
 import com.fuint.business.userGroup.vo.UserMassSendVo;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * 会员群发(UserMassSend)表服务实现类
  *
@@ -18,8 +25,13 @@ import org.springframework.stereotype.Service;
 @Service("userMassSendService")
 public class UserMassSendServiceImpl extends ServiceImpl<UserMassSendMapper,UserMassSend> implements UserMassSendService {
 
+    @Autowired
+    private UserMassSendRecordService userMassSendRecordService;
+
     @Override
     public IPage<UserMassSendVo> queryPage(Page page, UserMassSendVo userGroup) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        userGroup.setStoreId(nowAccountInfo.getStoreId());
         return baseMapper.queryPage(page,userGroup);
     }
 
@@ -42,7 +54,35 @@ public class UserMassSendServiceImpl extends ServiceImpl<UserMassSendMapper,User
      */
     @Override
     public int insert(UserMassSend userMassSend) {
-        return baseMapper.insert(userMassSend);
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        userMassSend.setStoreId(nowAccountInfo.getStoreId());
+        userMassSend.setChainStoreId(nowAccountInfo.getChainStoreId());
+        if (userMassSend.getActivityTimeType().equals("1")){
+            if (userMassSend.getActivityTimeFront().before(new Date()) && userMassSend.getActivityTimeAfter().after(new Date())){
+                userMassSend.setStatus("1");
+            }else if (userMassSend.getActivityTimeFront().before(new Date()) && userMassSend.getActivityTimeAfter().before(new Date())){
+                userMassSend.setStatus("2");
+            }else {
+                userMassSend.setStatus("0");
+            }
+        }else {
+            userMassSend.setStatus("1");
+        }
+        int row = baseMapper.insert(userMassSend);
+        IPage<UserMassSendVo> userMassSendVoIPage = baseMapper.queryPage(new Page<>(), new UserMassSendVo());
+        UserMassSendVo userMassSendVo = userMassSendVoIPage.getRecords().get(0);
+        UserMassSendRecord userMassSendRecord = new UserMassSendRecord();
+        userMassSendRecord.setStoreId(userMassSendVo.getStoreId());
+        userMassSendRecord.setChainStoreId(userMassSendVo.getChainStoreId());
+        userMassSendRecord.setMassSendId(userMassSendVo.getId());
+        userMassSendRecord.setSendGift(userMassSendVo.getSenfGift());
+        userMassSendRecord.setSendWay(userMassSendVo.getSendWay());
+        userMassSendRecord.setUserNum(userMassSendVo.getSendUserNum());
+        userMassSendRecord.setSuccessNum(userMassSendRecord.getUserNum());
+        userMassSendRecord.setFailNum(0);
+        userMassSendRecord.setStatus("0");
+        userMassSendRecordService.insert(userMassSendRecord);
+        return row;
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserGroupVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserGroupVo.java
index 99de4de99..374698c7e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserGroupVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserGroupVo.java
@@ -1,5 +1,6 @@
 package com.fuint.business.userGroup.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuint.business.userGroup.entity.UserGroup;
 import lombok.Data;
 
@@ -9,4 +10,14 @@ public class UserGroupVo extends UserGroup {
      * 创建人
      */
     private String accountName;
+    /**
+     * 会员数量
+     */
+    @TableField(exist = false)
+    private Integer userNum;
+    /**
+     * 会员占比
+     */
+    @TableField(exist = false)
+    private Double userProportion;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserMassSendRecordVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserMassSendRecordVo.java
index 1553f5551..b3df117b0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserMassSendRecordVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/vo/UserMassSendRecordVo.java
@@ -13,4 +13,8 @@ public class UserMassSendRecordVo extends UserMassSendRecord {
      * 创建人
      */
     private String accountName;
+    /**
+     * 群发内容
+     */
+    private String massContent;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
index 2fe235251..a587a7dc2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/UserBalanceController.java
@@ -8,10 +8,7 @@ import com.fuint.business.userManager.vo.UserBalanceVo;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/business/userManager/userbalance")
@@ -31,5 +28,8 @@ public class UserBalanceController  extends BaseController {
         return getSuccessResult(userBalanceService.getDataByZt(user));
     }
 
-
+    @GetMapping("{id}")
+    public ResponseObject logOffBalance(@PathVariable Integer id){
+        return getSuccessResult(userBalanceService.logOffBalance(id));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
index 36b0672cb..1675d8c00 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
@@ -76,6 +76,10 @@ public class    UserBalance extends BaseEntity implements Serializable {
      * 会员标签id
      */
     private Integer userLabelId;
+    /**
+     * 会员注销状态：0、使用中；1、已注销
+     */
+    private String userStatus;
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
index 8dbc0e3b7..472244b46 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
@@ -10,7 +10,7 @@
     </sql>
     <sql id="selectUserAndBalance">
         select mu.*,mub.id balanceId,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money,
-               mub.second_card,mub.fixing_level,mub.create_time balCreateTime,mub.remark remark,mub.user_label_id userLabelId
+               mub.second_card,mub.fixing_level,mub.create_time balCreateTime,mub.remark remark,mub.user_label_id userLabelId,mub.user_status
         FROM mt_user mu
                  LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id
     </sql>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
index cd89745af..dcde6c408 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java
@@ -76,4 +76,11 @@ public interface UserBalanceService extends IService<UserBalance> {
     int addUserBalance(Integer userId, Integer chainStoreId, Double changeBalance);
 
     Double selectAllBalance(Integer storeId);
+
+    /**
+     * 用户注销
+     * @param id
+     * @return
+     */
+    int logOffBalance(Integer id);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index 814ff8d8c..aa367a2b3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -222,6 +222,15 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         return cardBalance;
     }
 
+    @Override
+    public int logOffBalance(Integer id) {
+        UserBalance userBalance = baseMapper.selectById(id);
+        if (ObjectUtil.isEmpty(userBalance)) return 0;
+
+        userBalance.setUserStatus("1");
+        return baseMapper.updateById(userBalance);
+    }
+
     @Resource
     RedisLock redisLock;
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
index cd14b45dd..bad0c5df5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
@@ -133,4 +133,8 @@ public class LJUserVo extends BaseEntity {
      * 会员标签id
      */
     private Integer userLabelId;
+    /**
+     * 会员注销状态：0、使用中；1、已注销
+     */
+    private Integer userStatus;
 }