From 20d6b215611689a8f40efaddead9a1f19d1abf64 Mon Sep 17 00:00:00 2001 From: JS-LM <2497833386@QQ.com> Date: Fri, 16 Jun 2023 09:09:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/merchant/components/adapayMember.vue | 14 +++++- .../pile/merchant/components/revenue.vue | 47 +++++++++---------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 3315e1cef..3f4dedae2 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -52,7 +52,9 @@ {{ item.bankCode }} - {{item.provCode}}/ {{item.areaCode}} + {{provCode(item.provCode)}}/ {{areaCode(item.areaCode)}} + + @@ -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] }, diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue index 01812501d..3f16c0372 100644 --- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue +++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue @@ -96,13 +96,13 @@ /> - + /> @@ -115,52 +115,47 @@ export default { value: "", reportList: [], merchantOrderReport: {}, + total:0, queryParams: { pageNum: 1, pageSize: 10, - merchantId: null, - stationId: null, - stationName: null, - useElectricity: null, - chargeNum: null, - chargeTime: null, - electricityAmount: null, - serviceAmount: null, - totalAmount: null, - virtualAmount: null, - tradeDate: null, - tradeAmount: null, - tradeFee: null, + merchantId: this.merchantId, + startTime:'', + endTime:'' }, }; }, methods: { getList() { - const params = { - merchantId: this.merchantId, - startTime: "", - endTime: "", - }; - getMerchantOrderReport(params).then( + console.log('queryParams',this.queryParams) + getMerchantOrderReport(this.queryParams).then( (response) => { // console.log("查询报表", reportList, merchantOrderReport); - console.log('response',response) - this.reportList = response.data.reportList; + // console.log('getMerchantOrderReport',response) + 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); From 4791c1ed4ac9d21776143d8afc408032850704d8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 16 Jun 2023 09:13:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8=E5=81=9A?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SettleOrderReportServiceImpl.java | 17 ++++++++++++++--- .../pile/vo/web/MerchantOrderReportVO.java | 5 ++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index d4749d698..7ab599282 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/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 pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); + int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum(); + 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 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)); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java index 8e1565b19..a0763c8f8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java +++ b/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 reportList; + // private List reportList; + + private PageResponse pageResponse; @Data public static class MerchantOrderReport{