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

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

@@ -1,6 +1,7 @@
 package com.jsowell.pile.service.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
@@ -105,8 +106,8 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
      */
     @Override
     public MerchantOrderReportVO getMerchantOrderReport(MerchantOrderReportDTO dto) {
-        int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
+        int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
-        int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
+        int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
         if (StringUtils.isBlank(dto.getStartTime())) {
             dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)));
         }
@@ -122,7 +123,17 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
         }
         PageInfo<SettleOrderReportVO> pageInfo = new PageInfo<>(list);
         vo.setMerchantId(dto.getMerchantId());
-        vo.setReportList(pageInfo.getList());
+        // vo.setReportList(pageInfo.getList());
+
+        PageResponse pageResponse = PageResponse.builder()
+                .pageSize(pageSize)
+                .pageNum(pageNum)
+                .pages(pageInfo.getPages())
+                .total(pageInfo.getTotal())
+                .list(pageInfo.getList())
+
+                .build();
+        vo.setPageResponse(pageResponse);
         // 进行数据汇总
         // 用电度数
         report.setUseElectricity(list.stream().map(SettleOrderReportVO::getUseElectricity).reduce(BigDecimal.ZERO, BigDecimal::add));

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.vo.web;
 
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.SettleOrderReport;
 import lombok.Data;
 
@@ -12,7 +13,9 @@ public class MerchantOrderReportVO {
 
     private MerchantOrderReport merchantOrderReport;
 
-    private List<SettleOrderReportVO> reportList;
+    // private List<SettleOrderReportVO> reportList;
+
+    private PageResponse pageResponse;
 
    @Data
    public static class MerchantOrderReport{

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

@@ -52,7 +52,9 @@
                 <el-descriptions-item label="银行编码">{{
                     item.bankCode
                 }}</el-descriptions-item>
-                <el-descriptions-item label="银行账户开户银行所在省份编码">{{item.provCode}}/ {{item.areaCode}}</el-descriptions-item>
+                <el-descriptions-item label="银行账户开户银行所在省份编码">{{provCode(item.provCode)}}/ {{areaCode(item.areaCode)}}
+                    
+                </el-descriptions-item>
             </el-descriptions>
         </el-card>
         </template>
@@ -316,8 +318,16 @@ export default {
         };
     },
     methods: {
+        areaCode(area){
+            let arr = this.options.find(item => item.cities[0].value == area)
+            return arr.title
+
+        },
+        provCode(code){
+            let arr = this.options.find(item => item.value == code)
+            return arr.title
+        },
         handleChange(value) {
-            console.log(value);
             this.ruleForm.provCode = value[0]
             this.ruleForm.areaCode = value[1]
         },

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

@@ -96,13 +96,13 @@
             />
         </el-table>
 
-        <!-- <pagination
+        <pagination
             v-show="total > 0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
-        /> -->
+        />
     </div>
 </template>
 
@@ -115,52 +115,47 @@ export default {
             value: "",
             reportList: [],
             merchantOrderReport: {},
+            total:0,
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
-                merchantId: null,
+                merchantId: this.merchantId,
-                stationId: null,
+                startTime:'',
-                stationName: null,
+                endTime:''
-                useElectricity: null,
-                chargeNum: null,
-                chargeTime: null,
-                electricityAmount: null,
-                serviceAmount: null,
-                totalAmount: null,
-                virtualAmount: null,
-                tradeDate: null,
-                tradeAmount: null,
-                tradeFee: null,
             },
         };
     },
     methods: {
         getList() {
-            const params = {
+            console.log('queryParams',this.queryParams)
-                merchantId: this.merchantId,
+            getMerchantOrderReport(this.queryParams).then(
-                startTime: "",
-                endTime: "",
-            };
-            getMerchantOrderReport(params).then(
                 (response) => {
                     // console.log("查询报表", reportList, merchantOrderReport);
-                    console.log('response',response)
+                    // console.log('getMerchantOrderReport',response)
-                    this.reportList = response.data.reportList;
+                    this.reportList = response.data.pageResponse.list;
                     this.merchantOrderReport = response.data.merchantOrderReport;
-                    console.log("查询报表", this.merchantOrderReport, this.reportList);
+                    // console.log("查询报表", this.merchantOrderReport, this.reportList);
+                    this.total = response.data.pageResponse.total
                 }
             );
         },
         handleQuery() {
             console.log("this.value 日期", this.value);
+            let arr = this.value[0].split(' ')[0]
+            let str = this.value[1].split(' ')[0]
+            console.log('arr,str',arr,str)
+            this.queryParams.startTime = arr
+            this.queryParams.endTime = str
             this.queryParams.pageNum = 1;
             this.getList();
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.value = null;
+            this.value = ''
+             this.queryParams.startTime = ''
+            this.queryParams.endTime =''
             this.resetForm("queryForm");
-            this.handleQuery();
+             this.getList();
         },
         handleSelectionChange(selection) {
             console.log("selection", selection);