新增营收报表

jsowell-ui/src/api/adapayMember/adapayMember.js

@@ -16,4 +16,11 @@ export function selectAdapayMember(data) {
   })
 }
 
-
+// 营收报表
+export function getMerchantOrderReport(data) {
+  return request({
+    url: '/pile/report/getMerchantOrderReport',
+    method: 'post',
+    data: data
+  })
+}

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-card class="box-card" shadow="hover">
+        <el-card class="box-card" shadow="hover" style="margin-bottom: 10px">
             <div style="margin: 12px 0">汇付会员</div>
             <div style="margin: 12px 0" v-if="ruleForm.nickname == ''">
                 没有查询到汇付会员配置，请点击按钮创建汇付会员
@@ -15,49 +15,6 @@
                 <el-descriptions-item label="会员性别">{{ruleForm.gender === 'FEMALE'?'女':'男'}}</el-descriptions-item>
                 <el-descriptions-item label="会员地址">{{ruleForm.location}}</el-descriptions-item>
             </el-descriptions>
-<!--            <el-form-->
-<!--                :model="ruleForm"-->
-<!--                :rules="rules"-->
-<!--                ref="ruleForm"-->
-<!--                label-width="250px"-->
-<!--                class="demo-ruleForm"-->
-<!--                v-else-->
-<!--            >-->
-<!--                <el-row :gutter="24">-->
-<!--                    <el-col :span="12">-->
-<!--                        <el-form-item label="会员昵称" prop="nickname">-->
-<!--                            <el-input v-model="ruleForm.nickname"></el-input>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="12">-->
-<!--                        <el-form-item label="会员邮箱" prop="email">-->
-<!--                            <el-input v-model="ruleForm.email"></el-input>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                </el-row>-->
-<!--                <el-row :gutter="24">-->
-<!--                    <el-col :span="12">-->
-<!--                        <el-form-item label="会员性别" prop="gender">-->
-<!--                            <el-radio-group v-model="ruleForm.gender">-->
-<!--                                <el-radio label="MALE">男</el-radio>-->
-<!--                                <el-radio label="FEMALE">女</el-radio>-->
-<!--                            </el-radio-group>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="12">-->
-<!--                        <el-form-item label="会员地址" prop="location">-->
-<!--                            &lt;!&ndash; type="textarea" &ndash;&gt;-->
-<!--                            <el-input v-model="ruleForm.location"></el-input>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                </el-row>-->
-<!--                <el-form-item v-if="ruleForm.nickname == ''">-->
-<!--                    <el-button-->
-<!--                        type="primary"-->
-<!--                        @click="submitForm('ruleForm')"-->
-<!--                    >提交</el-button>-->
-<!--                </el-form-item>-->
-<!--            </el-form>-->
         </el-card>
 
         <el-card class="box-card" shadow="hover">

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -0,0 +1,175 @@
+<template>
+    <div class="app-container">
+      <h2>营收总报</h2>
+        <el-descriptions >
+    <el-descriptions-item label="用电度数">{{merchantOrderReport.useElectricity}}度</el-descriptions-item>
+    <el-descriptions-item label="充电次数">{{merchantOrderReport.chargeNum}}次</el-descriptions-item>
+    <el-descriptions-item label="充电时长">{{merchantOrderReport.chargeTime}}分钟</el-descriptions-item>
+    <el-descriptions-item label="电费金额">{{merchantOrderReport.electricityAmount}}元</el-descriptions-item>
+    <el-descriptions-item label="服务费金额">{{merchantOrderReport.serviceAmount}}元</el-descriptions-item>
+    <el-descriptions-item label="收入金额">{{merchantOrderReport.totalAmount}}元</el-descriptions-item>
+    <el-descriptions-item label="交易金额">{{merchantOrderReport.tradeAmount}}元</el-descriptions-item>
+    <el-descriptions-item label="交易手续费">{{merchantOrderReport.tradeFee}}</el-descriptions-item>
+    <el-descriptions-item label="虚拟金额">{{merchantOrderReport.virtualAmount}}元</el-descriptions-item>
+</el-descriptions>
+        <h2>营收日报</h2>
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            inline
+            label-width="68px"
+        >
+            <el-form-item label="日期" prop="tradeDate">
+                <el-date-picker
+                    v-model="value"
+                    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="false"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
+        <el-table @selection-change="handleSelectionChange" :data="reportList">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="交易日期" align="center" prop="tradeDate" />
+            <el-table-column
+                label="用电度数"
+                align="center"
+                prop="useElectricity"
+            />
+            <el-table-column label="充电次数" align="center" prop="chargeNum" />
+            <el-table-column
+                label="充电时长"
+                align="center"
+                prop="chargeTime"
+            />
+            <el-table-column
+                label="电费金额"
+                align="center"
+                prop="electricityAmount"
+            />
+            <el-table-column
+                label="服务费金额"
+                align="center"
+                prop="serviceAmount"
+            />
+            <el-table-column
+                label="收入金额"
+                align="center"
+                prop="totalAmount"
+            />
+            <el-table-column
+                label="虚拟金额"
+                align="center"
+                prop="virtualAmount"
+            />
+            <el-table-column
+                label="交易金额"
+                align="center"
+                prop="tradeAmount"
+            />
+            <el-table-column
+                label="交易手续费"
+                align="center"
+                prop="tradeFee"
+            />
+        </el-table>
+
+        <!-- <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        /> -->
+    </div>
+</template>
+
+<script>
+import { getMerchantOrderReport } from "@/api/adapayMember/adapayMember";
+export default {
+    props: ["merchantId"],
+    data() {
+        return {
+            value: "",
+            reportList: [],
+            merchantOrderReport: {},
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                merchantId: null,
+                stationId: null,
+                useElectricity: null,
+                chargeNum: null,
+                chargeTime: null,
+                electricityAmount: null,
+                serviceAmount: null,
+                totalAmount: null,
+                virtualAmount: null,
+                tradeDate: null,
+                tradeAmount: null,
+                tradeFee: null,
+            },
+        };
+    },
+    methods: {
+        getList() {
+            const params = {
+                merchantId: this.merchantId,
+                startTime: "",
+                endTime: "",
+            };
+            getMerchantOrderReport(params).then(
+                ({ data: { merchantOrderReport, reportList } }) => {
+                    // console.log("查询报表", reportList, merchantOrderReport);
+                    this.reportList = reportList;
+                    this.merchantOrderReport = merchantOrderReport;
+                    console.log("查询报表", this.merchantOrderReport, this.reportList);
+                }
+            );
+        },
+        handleQuery() {
+            console.log("this.value 日期", this.value);
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.value = null;
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        handleSelectionChange(selection) {
+            console.log("selection", selection);
+            // this.ids = selection.map(item => item.id)
+            // this.single = selection.length!==1
+            // this.multiple = !selection.length
+        },
+    },
+    created() {
+        this.getList();
+    },
+};
+</script>
+
+<style></style>

jsowell-ui/src/views/pile/merchant/detail.vue

@@ -8,6 +8,9 @@
     <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
     <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
     <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
+    <el-tab-pane label="营收报表" name="revenue">
+      <revenue :merchantId="merchantId"></revenue>
+    </el-tab-pane>
   </el-tabs>
     </div>
 
@@ -15,11 +18,12 @@
 
 <script>
 import adapayMember from './components/adapayMember.vue';
+import Revenue from './components/revenue.vue';
 export default {
-  components: { adapayMember },
+  components: { adapayMember, Revenue },
  data() {
       return {
-        activeName: 'first',
+        activeName: 'revenue',
         merchantId:this.$route.params.id
       };
     },

jsowell-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         target: `http://localhost:8080`,
         // 更改代理为本地地址
-        // target: `http://192.168.18.2:8080`,
+        // target: `http://192.168.2.5:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",