Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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

@@ -139,3 +139,12 @@ export function getMerchantList() {
         method: 'get'
     })
 }
+
+// 查询钱包明细
+export function getMemberBalanceChangesV2(data) {
+    return request({
+        url: '/uniapp/member/getMemberBalanceChangesV2',
+        method: 'post',
+        data: data
+    });
+}

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

@@ -1,16 +1,15 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-                 label-width="68px">
 
             <el-form-item label="会员ID" prop="memberId">
                 <el-input v-model="queryParams.memberId" placeholder="请输入会员ID" clearable
-                          @keyup.enter.native="handleQuery"/>
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
 
             <el-form-item label="手机号" prop="mobileNumber">
                 <el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号" clearable
-                          @keyup.enter.native="handleQuery"/>
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
 
             <el-form-item>
@@ -22,7 +21,7 @@
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                           v-hasPermi="['member:merchantVip:add']">开卡
+                    v-hasPermi="['member:merchantVip:add']">开卡
                 </el-button>
             </el-col>
             <!--<el-col :span="1.5">
@@ -61,16 +60,16 @@
         </el-row>
 
         <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="卡号" align="center" prop="walletCode"/>
+            <el-table-column label="卡号" align="center" prop="walletCode" />
-            <el-table-column label="运营商" align="center" prop="merchantName"/>
+            <el-table-column label="运营商" align="center" prop="merchantName" />
-            <el-table-column label="会员id" align="center" prop="memberId"/>
+            <el-table-column label="会员id" align="center" prop="memberId" />
             <el-table-column label="头像" align="center" prop="avatarUrl">
                 <template slot-scope="scope">
                     <!--          <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
                     <el-image style="height: 50px;width: 50px"
-                              :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
+                        :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
-                              :preview-src-list='[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="nickName">
@@ -80,51 +79,53 @@
                     </router-link>
                 </template>
             </el-table-column>
-            <el-table-column label="手机号" align="center" prop="mobileNumber"/>
+            <el-table-column label="手机号" align="center" prop="mobileNumber" />
-            <el-table-column label="本金余额" align="center" prop="principalBalance"/>
+            <el-table-column label="本金余额" align="center" prop="principalBalance" />
-            <el-table-column label="赠送余额" align="center" prop="giftBalance"/>
+            <el-table-column label="赠送余额" align="center" prop="giftBalance" />
-            <el-table-column label="总余额" align="center" prop="totalAccountAmount"/>
+            <el-table-column label="总余额" align="center" prop="totalAccountAmount" />
-            <el-table-column label="备注" align="center" prop="remark"/>
+            <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateBalance(scope.row)"
-                               v-hasPermi="['member:merchantVip:update']">充值/扣款
+                        v-hasPermi="['member:merchantVip:update']">充值/扣款
                     </el-button>
                 </template>
             </el-table-column>
+            <el-table-column label="查看" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click="viewDetails(scope.row)">明细</el-button>
+                </template>
+            </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                    :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
-                    @pagination="getList"/>
 
         <!-- 添加或修改会员基础信息对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="createMerchantVip" :rules="rules" label-width="100px">
                 <el-form-item label="选择运营商">
-                    <el-select v-model="createMerchantVip.targetMerchantId" clearable placeholder="请选择运营商" @change="$forceUpdate()">
+                    <el-select v-model="createMerchantVip.targetMerchantId" clearable placeholder="请选择运营商"
-                        <el-option v-for="item in merchantList"
+                        @change="$forceUpdate()">
-                                   :key="item.merchantId"
+                        <el-option v-for="item in merchantList" :key="item.merchantId" :label="item.merchantName"
-                                   :label="item.merchantName"
+                            :value="item.merchantId">
-                                   :value="item.merchantId">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="手机号码">
-                    <el-input v-model="createMerchantVip.mobileNumber" placeholder="请输入手机号码"/>
+                    <el-input v-model="createMerchantVip.mobileNumber" placeholder="请输入手机号码" />
                 </el-form-item>
                 <el-form-item label="操作类型">
                     <el-radio v-model="createMerchantVip.type" label="1" border>充值</el-radio>
                     <el-radio v-model="createMerchantVip.type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
-                    <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额"
+                    <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0"
-                                     :min="0"
+                        :controls="false" :precision="2" />
-                                     :controls="false" :precision="2"/>
                 </el-form-item>
                 <el-form-item label="赠送金" prop="balance">
                     <el-input-number v-model="createMerchantVip.updateGiftBalance" placeholder="请输入赠送金" :min="0"
-                                     :controls="false" :precision="2"/>
+                        :controls="false" :precision="2" />
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -135,7 +136,7 @@
 
         <!-- 添加或修改会员余额对话框 -->
         <el-dialog title="会员充值/扣款" @close="closeUpdateBalance" :visible.sync="openUpdateBalance" width="500px"
-                   append-to-body>
+            append-to-body>
             <p>线下充值本金，客户直接在线下付款给商家</p>
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-form-item label="选择运营商">
@@ -146,13 +147,12 @@
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
-                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0"
+                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0" :controls="false"
-                                     :controls="false"
+                        :precision="2" />
-                                     :precision="2"/>
                 </el-form-item>
                 <el-form-item label="赠送金" prop="balance">
                     <el-input-number v-model="updateGiftBalance" placeholder="请输入赠送金" :min="0" :controls="false"
-                                     :precision="2"/>
+                        :precision="2" />
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -160,28 +160,67 @@
                 <el-button @click="resetBalance">取 消</el-button>
             </div>
         </el-dialog>
+        <!-- 明细 -->
+        <el-dialog title="交易明细" :visible.sync="vehicleDetails" :before-close="closeDetails" width="1200px" append-to-body>
+            <el-form :model="detailParameters" size="small" :inline="true">
+                <el-form-item label="选择日期" prop="tradeDate">
+                    <el-date-picker v-model="createTimeRange" type="month" value-format="yyyy-MM" range-separator="-"
+                        placeholder="选择日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item style="margin-left: 10px;">
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="getDetails">搜索</el-button>
+                </el-form-item>
+                <el-col :span="24">
+                    <el-form-item label="充值余额:"> {{ totalRechargeAmount }} </el-form-item>
+                    <el-form-item label="消费金额:" style="padding-left: 50px;">{{ totalConsumption }}</el-form-item>
+                    <el-form-item label="累计充值金额:" style="padding-left: 50px;">{{ accumulatedRechargeAmount }}</el-form-item>
+                    <el-form-item label="累计消费金额:" style="padding-left: 50px;">{{ accumulatedConsumptionAmount
+                    }}</el-form-item>
+                </el-col>
+            </el-form>
+            <el-table :data="detailList" stripe style="width: 100%" v-loading="loadings">
+                <el-table-column label="后管充值" align="center" prop="amount">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.subType == '充值'">{{ scope.row.amount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="后管扣款" align="center" prop="amount">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.subType == '后管扣款'">{{ scope.row.amount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="支付金额" align="center" prop="payAmount" />
+                <el-table-column label="订单金额" align="center" prop="orderAmount" />
+                <el-table-column label="已退款" align="center" prop="refundAmount" />
+                <el-table-column label="时间" align="center" prop="transactionTime" />
+            </el-table>
+            <!--分页-->
+            <pagination v-show="closeTotal > 0" :total="closeTotal" :page.sync="detailParameters.pageNum"
+                :limit.sync="detailParameters.pageSize" @pagination="getDetails" style="margin-bottom: 20px" />
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import {
-    listInfo,
     getInfo,
     delInfo,
     addInfo,
     updateInfo,
     updateMemberBalance,
-    getMerchantList, queryMerchantVipList, createMerchantVip,
+    getMerchantList, queryMerchantVipList, createMerchantVip, getMemberBalanceChangesV2
 } from "@/api/member/info";
-
+import { parseTime } from "@/utils/common";
 export default {
     name: "Info",
     dicts: ['member_status'],
     data() {
         return {
-            defaultImg: [{img: require('../../../assets/images/headPort.png')}],
+            defaultImg: [{ img: require('../../../assets/images/headPort.png') }],
             // 遮罩层
             loading: true,
+            loadings: true,
             // 选中数组
             ids: [],
             // 非单个禁用
@@ -230,6 +269,21 @@ export default {
             updateMerchantVip: {},
             forbid: '', //充值/扣款参数
             selectedValue: null, // 设置默认选中第一条数据
+            vehicleDetails: false,
+            detailList: [],
+            totalConsumption: 0,
+            totalRechargeAmount: 0,
+            accumulatedRechargeAmount: 0,
+            accumulatedConsumptionAmount: 0,
+            closeTotal: 0,
+            detailParameters: {
+                pageNum: 1,
+                pageSize: 10,
+                walletCode: null,
+                tradeDate: null,
+                memberId: null
+            },
+            createTimeRange: [],
         };
     },
     computed: {
@@ -417,7 +471,46 @@ export default {
             this.download('member/info/export', {
                 ...this.queryParams
             }, `info_${new Date().getTime()}.xlsx`)
-        }
+        },
-    }
+        viewDetails(row) {
+            console.log(row);
+            this.detailParameters.walletCode = row.walletCode;
+            this.detailParameters.memberId = row.memberId;
+            this.detailParameters.tradeDate = parseTime(new Date(), '{y}-{m}'); //设置默认日期
+            this.createTimeRange = this.detailParameters.tradeDate;
+            this.vehicleDetails = true;
+            this.getDetails();
+        },
+        closeDetails() {
+            this.vehicleDetails = false;
+            this.detailList = [];
+            this.totalConsumption = 0;
+            this.totalRechargeAmount = 0;
+        },
+        getDetails() {
+            this.loadings = true;
+            console.log(this.detailParameters);
+            getMemberBalanceChangesV2(this.detailParameters).then(response => {
+                console.log(response);
+                this.loadings = false;
+                this.detailList = response.obj.pageResponse.list;
+                this.totalRechargeAmount = response.obj.totalRechargeAmount;
+                this.accumulatedRechargeAmount = response.obj.accumulatedRechargeAmount;
+                this.accumulatedConsumptionAmount = response.obj.accumulatedConsumptionAmount;
+                this.totalConsumption = response.obj.totalConsumption;
+                this.closeTotal = response.obj.pageResponse.total;
+            });
+        },
+    },
+    watch: {
+        createTimeRange(newValue, oldValue) {
+            console.log("createTimeRange发生变化", newValue, oldValue);
+            if (newValue != null && newValue.length > 0) {
+                this.detailParameters.tradeDate = newValue;
+            } else {
+                this.detailParameters.tradeDate = null;
+            }
+        },
+    },
 };
 </script>

jsowell-ui/src/views/pile/basic/index.vue

@@ -41,10 +41,10 @@
             <el-col :span="1.5">
                 <el-button
                     type="primary"
-                    icon="el-icon-refresh-right"
+                    icon="el-icon-search"
                     size="mini"
                     @click="handleQuery"
-                >刷新
+                >搜索
                 </el-button
                 >
             </el-col>