diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue
index e0c455918..b32e5bf9a 100644
--- a/jsowell-ui/src/views/member/memberGroup/detail.vue
+++ b/jsowell-ui/src/views/member/memberGroup/detail.vue
@@ -7,131 +7,82 @@
                     <!-- 客户 -->
                     <el-tab-pane label="客户">
                         <el-col>
-                            <el-button type="primary" size="mini" icon="el-icon-plus"
-                                       @click="handleAddMember">添加会员
+                            <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAddMember">添加会员
                             </el-button>
                         </el-col>
                         <el-table :data="memberGroupList" stripe style="width: 100%" v-loading="loading">
-                            <el-table-column label="会员id" align="center" prop="memberId"/>
-                            <el-table-column label="昵称" align="center" prop="nickName"/>
+                            <el-table-column label="会员id" align="center" prop="memberId" />
+                            <el-table-column label="昵称" align="center" prop="nickName" />
                             <el-table-column label="状态" align="center" prop="status">
                                 <template slot-scope="scope">
-                                    <dict-tag :options="dict.type.member_status" :value="scope.row.status"/>
+                                    <dict-tag :options="dict.type.member_status" :value="scope.row.status" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="头像" align="center" prop="avatarUrl">
                                 <template slot-scope="scope">
                                     <el-image style="height: 50px;width: 50px"
-                                              :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
-                                              :preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]'/>
+                                        :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
+                                        :preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="手机号" align="center" prop="mobileNumber"/>
+                            <el-table-column label="手机号" align="center" prop="mobileNumber" />
                         </el-table>
                         <!--分页-->
                         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                                    :limit.sync="queryParams.pageSize" @pagination="getMemberList"
-                                    style="margin-bottom: 20px"/>
+                            :limit.sync="queryParams.pageSize" @pagination="getMemberList" style="margin-bottom: 20px" />
                     </el-tab-pane>
 
                     <!-- 交易明细 -->
                     <el-tab-pane label="交易明细">
                         <!--搜索条件-->
-                        <el-form
-                            :model="queryOrderParams"
-                            ref="queryForm"
-                            size="small"
-                            :inline="true"
-                            v-show=true
-                            label-width="168px"
-                            @submit.native.prevent
-                        >
+                        <el-form :model="queryOrderParams" ref="queryForm" size="small" :inline="true" v-show=true
+                            label-width="168px" @submit.native.prevent>
                             <el-form-item label="订单编号" prop="orderCode">
-                                <el-input
-                                    v-model="queryOrderParams.orderCode"
-                                    placeholder="请输入订单编号"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                                />
+                                <el-input v-model="queryOrderParams.orderCode" placeholder="请输入订单编号" clearable
+                                    @keyup.enter.native="handleQuery" />
                             </el-form-item>
 
                             <el-form-item label="订单状态" prop="orderStatus">
-                                <el-select
-                                    v-model="queryOrderParams.orderStatus"
-                                    placeholder="请选择订单状态"
-                                    clearable
-                                    style="width: 140px"
-                                >
-                                    <el-option
-                                        v-for="dict in dict.type.order_status"
-                                        :key="dict.value"
-                                        :label="dict.label"
-                                        :value="dict.value"
-                                    />
+                                <el-select v-model="queryOrderParams.orderStatus" placeholder="请选择订单状态" clearable
+                                    style="width: 140px">
+                                    <el-option v-for="dict in dict.type.order_status" :key="dict.value" :label="dict.label"
+                                        :value="dict.value" />
                                 </el-select>
                             </el-form-item>
 
                             <el-form-item label="手机号码" prop="mobileNumber">
-                                <el-input
-                                    v-model="queryOrderParams.mobileNumber"
-                                    placeholder="请输入手机号码"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                                />
+                                <el-input v-model="queryOrderParams.mobileNumber" placeholder="请输入手机号码" clearable
+                                    @keyup.enter.native="handleQuery" />
                             </el-form-item>
 
                             <el-form-item label="创建时间">
                                 <el-date-picker v-model="queryOrderParams.createTimeRange" style="width: 240px"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                :default-time="['00:00:00', '23:59:59']" type="daterange"
-                                                range-separator="-"
-                                                start-placeholder="开始日期" end-placeholder="结束日期"
-                                                :clearable="true"/>
+                                    value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+                                    type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                                    :clearable="true" />
                             </el-form-item>
 
                             <el-form-item label="结算时间">
-                                <el-date-picker
-                                    v-model="queryOrderParams.settleTimeRange"
-                                    style="width: 240px"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    :default-time="['00:00:00', '23:59:59']"
-                                    type="daterange"
-                                    range-separator="-"
-                                    start-placeholder="开始日期"
-                                    end-placeholder="结束日期"
-                                    :clearable="true"
-                                ></el-date-picker>
+                                <el-date-picker v-model="queryOrderParams.settleTimeRange" style="width: 240px"
+                                    value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+                                    type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                                    :clearable="true"></el-date-picker>
                             </el-form-item>
                         </el-form>
 
                         <el-row :gutter="10" class="mb8">
                             <el-col :span="1.5">
-                                <el-button
-                                    type="primary"
-                                    icon="el-icon-search"
-                                    size="mini"
-                                    @click="handleQuery"
-                                >搜索
-                                </el-button
-                                >
+                                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
+                                </el-button>
                             </el-col>
                             <el-col :span="1.5">
-                                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                                >重置
-                                </el-button
-                                >
+                                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置
+                                </el-button>
                             </el-col>
                             <el-col :span="1.5">
-                                <el-button
-                                    type="warning"
-                                    plain
-                                    icon="el-icon-download"
-                                    size="mini"
-                                    @click="handleExport"
-                                    v-hasPermi="['order:order:export']"
-                                >导出
-                                </el-button
-                                >
+                                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                                    v-hasPermi="['order:order:export']">导出
+                                </el-button>
                             </el-col>
                             <div>
                                 <ul>
@@ -139,8 +90,8 @@
                                         {{
                                             totalDate.dateDescription
                                         }}期间，总用电量{{ totalDate.sumUsedElectricity }}度，总消费金额{{
-                                            totalDate.sumOrderAmount
-                                        }}元，总结算金额{{ totalDate.sumSettleAmount }}元
+    totalDate.sumOrderAmount
+}}元，总结算金额{{ totalDate.sumSettleAmount }}元
                                     </li>
                                 </ul>
                             </div>
@@ -150,45 +101,43 @@
                         <el-table :data="orderListResult" stripe style="width: 100%" v-loading="loading">
                             <el-table-column label="订单编号" align="center" prop="orderCode" width="280px">
                                 <template slot-scope="scope">
-                                    <router-link :to="'/order/index/orderDetail/' + scope.row.orderCode"
-                                                 class="link-type">
+                                    <router-link :to="'/order/index/orderDetail/' + scope.row.orderCode" class="link-type">
                                         <span>{{ scope.row.orderCode }}</span>
                                     </router-link>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="订单状态描述" align="center" prop="orderStatusDescribe"/>
-                            <el-table-column label="会员昵称" align="center" prop="nickName" width="120px"/>
-                            <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px"/>
-                            <el-table-column label="站点" align="center" prop="stationName"/>
-                            <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode"
-                                             width="200px"/>
-                            <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px"/>
+                            <el-table-column label="订单状态描述" align="center" prop="orderStatusDescribe" />
+                            <el-table-column label="会员昵称" align="center" prop="nickName" width="120px" />
+                            <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px" />
+                            <el-table-column label="站点" align="center" prop="stationName" />
+                            <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" width="200px" />
+                            <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px" />
                             <el-table-column label="启动方式" align="center" prop="startMode" width="100px">
                                 <template slot-scope="scope">
-                                    <dict-tag :options="dict.type.start_mode" :value="scope.row.startMode"/>
+                                    <dict-tag :options="dict.type.start_mode" :value="scope.row.startMode" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="支付方式" align="center" prop="payMode">
                                 <template slot-scope="scope">
-                                    <dict-tag :options="dict.type.pay_mode" :value="scope.row.payMode"/>
+                                    <dict-tag :options="dict.type.pay_mode" :value="scope.row.payMode" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="支付状态" align="center" prop="payStatus">
                                 <template slot-scope="scope">
-                                    <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
+                                    <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="支付金额" align="center" prop="payAmount"/>
-                            <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px"/>
-                            <el-table-column label="起始soc" align="center" prop="startSoc"/>
-                            <el-table-column label="终止soc" align="center" prop="endSoc"/>
-                            <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180"/>
-                            <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180"/>
-                            <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px"/>
+                            <el-table-column label="支付金额" align="center" prop="payAmount" />
+                            <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px" />
+                            <el-table-column label="起始soc" align="center" prop="startSoc" />
+                            <el-table-column label="终止soc" align="center" prop="endSoc" />
+                            <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180" />
+                            <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180" />
+                            <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px" />
                         </el-table>
                         <!--分页-->
                         <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="from.pageNum"
-                                    :limit.sync="from.pageSize" @pagination="getOrderList" style="margin-bottom: 20px"/>
+                            :limit.sync="from.pageSize" @pagination="getOrderList" style="margin-bottom: 20px" />
                     </el-tab-pane>
 
                     <el-tab-pane label="站点">
@@ -197,24 +146,22 @@
                             </el-button>
                         </el-col>
                         <el-table :data="sitesList" stripe style="width: 100%" v-loading="loading">
-                            <el-table-column label="站点名称" align="center" prop="stationName" width="300"/>
-                            <el-table-column label="备注" align="center" prop="templateRemark"/>
-                            <el-table-column label="描述" align="center" prop="templateDesc"/>
+                            <el-table-column label="站点名称" align="center" prop="stationName" width="300" />
+                            <el-table-column label="备注" align="center" prop="templateRemark" />
+                            <el-table-column label="描述" align="center" prop="templateDesc" />
                             <el-table-column label="操作" align="center" width="200">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text" icon="el-icon-edit"
-                                               @click="addasite(scope.row)">修改
+                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="addasite(scope.row)">修改
                                     </el-button>
                                     <el-button size="mini" type="text" icon="el-icon-delete"
-                                               @click="handleDelete(scope.row)">删除
+                                        @click="handleDelete(scope.row)">删除
                                     </el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
                         <!--分页-->
                         <pagination v-show="stationTotal > 0" :total="stationTotal" :page.sync="queryStation.pageNum"
-                                    :limit.sync="queryStation.pageSize" @pagination="getStationList"
-                                    style="margin-bottom: 20px"/>
+                            :limit.sync="queryStation.pageSize" @pagination="getStationList" style="margin-bottom: 20px" />
                     </el-tab-pane>
                 </el-tabs>
             </el-col>
@@ -231,10 +178,9 @@
         <el-dialog title="添加站点" :visible.sync="getSite" :before-close="getCancel" width="1000px" append-to-body>
             <el-form ref="exchangeRate" :model="exchangeRate" :rules="dialogRules">
                 <el-form-item label="请选择站点">
-                    <el-select v-model="selectSite" placeholder="请选择站点" filterable style="width:300px"
-                               @change="queryInfo">
+                    <el-select v-model="selectSite" placeholder="请选择站点" filterable style="width:300px" @change="queryInfo">
                         <el-option v-for="(station, index) in stationList" :key="index" :label="station.stationName"
-                                   :value="station.id"/>
+                            :value="station.id" />
                     </el-select>
                 </el-form-item>
                 <el-row :gutter="20" style="margin-top: 15px;">
@@ -261,25 +207,25 @@
                     <el-col :span="4">
                         <el-form-item prop="electricityPriceA">
                             <el-input v-model="exchangeRate.electricityPriceA" type="number" class="clearInputScore"
-                                      placeholder="0" clearable disabled/>
+                                placeholder="0" clearable disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="servicePriceA">
                             <el-input v-model="exchangeRate.servicePriceA" placeholder="0" clearable type="number"
-                                      class="clearInputScore" disabled/>
+                                class="clearInputScore" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyServiceA">
                             <el-input v-model="exchangeRate.modifyServiceA" type="number" class="clearInputScore"
-                                      placeholder="0" clearable/>
+                                placeholder="0" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyElectricityA">
                             <el-input v-model="exchangeRate.modifyElectricityA" placeholder="0" clearable type="number"
-                                      class="clearInputScore"/>
+                                class="clearInputScore" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -291,25 +237,25 @@
                     <el-col :span="4">
                         <el-form-item prop="electricityPriceB">
                             <el-input v-model="exchangeRate.electricityPriceB" type="number" class="clearInputScore"
-                                      placeholder="0" clearable disabled/>
+                                placeholder="0" clearable disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="servicePriceB">
                             <el-input v-model="exchangeRate.servicePriceB" placeholder="0" clearable type="number"
-                                      class="clearInputScore" disabled/>
+                                class="clearInputScore" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyServiceB">
                             <el-input v-model="exchangeRate.modifyServiceB" type="number" class="clearInputScore"
-                                      placeholder="0" clearable/>
+                                placeholder="0" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyElectricityB">
                             <el-input v-model="exchangeRate.modifyElectricityB" placeholder="0" clearable type="number"
-                                      class="clearInputScore"/>
+                                class="clearInputScore" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -321,25 +267,25 @@
                     <el-col :span="4">
                         <el-form-item prop="electricityPriceC">
                             <el-input v-model="exchangeRate.electricityPriceC" type="number" class="clearInputScore"
-                                      placeholder="0" clearable disabled/>
+                                placeholder="0" clearable disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="servicePriceC">
                             <el-input v-model="exchangeRate.servicePriceC" placeholder="0" clearable type="number"
-                                      class="clearInputScore" disabled/>
+                                class="clearInputScore" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyServiceC">
                             <el-input v-model="exchangeRate.modifyServiceC" type="number" class="clearInputScore"
-                                      placeholder="0" clearable/>
+                                placeholder="0" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyElectricityC">
                             <el-input v-model="exchangeRate.modifyElectricityC" placeholder="0" clearable type="number"
-                                      class="clearInputScore"/>
+                                class="clearInputScore" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -351,33 +297,33 @@
                     <el-col :span="4">
                         <el-form-item prop="electricityPriceD">
                             <el-input v-model="exchangeRate.electricityPriceD" type="number" class="clearInputScore"
-                                      placeholder="0" clearable disabled/>
+                                placeholder="0" clearable disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="servicePriceD">
                             <el-input v-model="exchangeRate.servicePriceD" placeholder="0" clearable type="number"
-                                      class="clearInputScore" disabled/>
+                                class="clearInputScore" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyServiceD">
                             <el-input v-model="exchangeRate.modifyServiceD" type="number" class="clearInputScore"
-                                      placeholder="0" clearable/>
+                                placeholder="0" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item prop="modifyElectricityD">
                             <el-input v-model="exchangeRate.modifyElectricityD" placeholder="0" clearable type="number"
-                                      class="clearInputScore"/>
+                                class="clearInputScore" />
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <span>24小时尖峰平谷分布设置</span>
                 <div>
                     <el-tag v-for="item in tagsTime" :key="item.label" :type="item.type"
-                            style="margin: 10px 10px 10px 0; width: 160px; height: 30px line-height:30px;text-align: center;"
-                            effect="dark">
+                        style="margin: 10px 10px 10px 0; width: 160px; height: 30px line-height:30px;text-align: center;"
+                        effect="dark">
                         {{ item.label }}
                     </el-tag>
                 </div>
@@ -391,10 +337,10 @@
 </template>
 
 <script>
-import {addMember, queryMemberList, preferentialTemplates, queryStationList} from "@/api/member/memberGroup";
-import {listOrder} from "@/api/order/order";
-import {getStationListByMerchantId} from "@/api/pile/station";
-import {queryStationBillingTemplateList, getTemplate} from "@/api/billing/template.js";
+import { addMember, queryMemberList, preferentialTemplates, queryStationList } from "@/api/member/memberGroup";
+import { listOrder } from "@/api/order/order";
+import { getStationListByMerchantId } from "@/api/pile/station";
+import { queryStationBillingTemplateList, getTemplate } from "@/api/billing/template.js";
 
 export default {
     name: 'JsowellUiDetail',
@@ -490,7 +436,7 @@ export default {
             total: 0,
             memberGroupList: [],
             getTotal: 0,
-            defaultImg: [{img: require('../../../assets/images/headPort.png')}],//默认头像
+            defaultImg: [{ img: require('../../../assets/images/headPort.png') }],//默认头像
             getSite: false, //添加站点框状态
             stationList: [], //站点列表
             selectSite: '',//选中的站点
@@ -516,28 +462,28 @@ export default {
             // 校验
             dialogRules: {
                 modifyServiceA: [
-                    {validator: validatePassA, trigger: 'blur'}
+                    { validator: validatePassA, trigger: 'blur' }
                 ],
                 modifyElectricityA: [
-                    {validator: validatePassB, trigger: 'blur'}
+                    { validator: validatePassB, trigger: 'blur' }
                 ],
                 modifyServiceB: [
-                    {validator: validatePassC, trigger: 'blur'}
+                    { validator: validatePassC, trigger: 'blur' }
                 ],
                 modifyElectricityB: [
-                    {validator: validatePassD, trigger: 'blur'}
+                    { validator: validatePassD, trigger: 'blur' }
                 ],
                 modifyServiceC: [
-                    {validator: validatePassE, trigger: 'blur'}
+                    { validator: validatePassE, trigger: 'blur' }
                 ],
                 modifyElectricityC: [
-                    {validator: validatePassF, trigger: 'blur'}
+                    { validator: validatePassF, trigger: 'blur' }
                 ],
                 modifyServiceD: [
-                    {validator: validatePassG, trigger: 'blur'}
+                    { validator: validatePassG, trigger: 'blur' }
                 ],
                 modifyElectricityD: [
-                    {validator: validatePassH, trigger: 'blur'}
+                    { validator: validatePassH, trigger: 'blur' }
                 ],
             },
             sitesList: [],//站点列表
@@ -644,6 +590,7 @@ export default {
             this.$refs["exchangeRate"].validate(valid => {
                 if (valid) {
                     let newOffers = {
+                        groupCode: this.$route.params.groupCode.split('&')[0],
                         stationId: this.stationId,
                         electricityPriceA: this.exchangeRate.modifyServiceA,
                         servicePriceA: this.exchangeRate.modifyElectricityA,