From d64c1c8eb0e4f6c7d4183fe3ffbc8e7d77721197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Sat, 2 Nov 2024 16:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E8=B4=A2=E5=8A=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=BA=A4=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/allOrder.js | 17 ++ .../reconciliation/tab/trading.vue | 10 +- .../runningWater/tab/day.vue | 151 +++++++++--------- .../controller/AllOrderInfoController.java | 25 +++ .../dto/StatisticsOneDayOrderAllDto.java | 32 ++++ .../order/mapper/AllOrderInfoMapper.java | 7 + .../order/mapper/xml/AllOrderInfoMapper.xml | 101 ++++++++++++ .../order/service/AllOrderInfoService.java | 4 + .../service/impl/AllOrderInfoServiceImpl.java | 17 ++ 9 files changed, 277 insertions(+), 87 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsOneDayOrderAllDto.java diff --git a/fuintAdmin/src/api/allOrder.js b/fuintAdmin/src/api/allOrder.js index 577d09148..9a958d116 100644 --- a/fuintAdmin/src/api/allOrder.js +++ b/fuintAdmin/src/api/allOrder.js @@ -286,3 +286,20 @@ export function getInstituionListApi6(query) { }) } + export function getInstituionListApi7(query) { + return request({ + url: 'business/allOrderInfo/getInstituionListApi7', + method: 'get', + params: query + + }) +} +export function getInstituionListApi9(query) { + return request({ + url: 'business/allOrderInfo/getInstituionListApi9', + method: 'get', + params: query + + }) +} + diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index b665e14b0..99336878f 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -295,7 +295,7 @@ :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" - @pagination="getDeptList" + @pagination="getList" /> { @@ -455,17 +456,10 @@ export default { // 获取数据列表 async getList(val) { - let dateRange = [] - if (this.beginTime && this.endTime) { - dateRange.push(this.beginTime) - dateRange.push(this.endTime) - } - console.log(this.beginTime) transactionList(this.queryParams).then(response => { this.orderList = response.data.records; this.total = response.data.total; this.isSysDate = false - this.getOrderStatistics() }) }, diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue index 99004b600..368b047d1 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue @@ -6,21 +6,15 @@
- - - 至 - + v-model="queryParams.dataRange" + type="daterange" + range-separator="至" + start-placeholder="开始日期" + end-placeholder="结束日期" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + > @@ -35,8 +29,8 @@
- -
0/0
+ +
{{orderStatisticsAll.orderMoney}}
@@ -44,8 +38,8 @@
- -
0/0
+ +
{{orderStatisticsAll.discountAmount}}
@@ -55,7 +49,7 @@
-
0/0
+
{{orderStatisticsAll.refMoney}}
@@ -65,7 +59,7 @@
-
{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
+
{{orderStatisticsAll.accountPending}}/{{orderStatisticsAll.repaidAmount}}
@@ -75,7 +69,7 @@
-
{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
+
{{orderStatisticsAll.trueMoney}}
@@ -85,7 +79,7 @@
-
{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
+
{{orderStatisticsAll.bidBalance?orderStatisticsAll.bidBalance:0}}/{{orderStatisticsAll.memberMoney?orderStatisticsAll.memberMoney:0}}
@@ -95,7 +89,7 @@
-
{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
+
{{orderStatisticsAll.newNum?orderStatisticsAll.newNum:0}}
@@ -108,35 +102,30 @@
- - - - - - - - - - - + + + + + + + + + + +
-
- - -
- +
@@ -148,7 +137,9 @@ import { getRunningWaterByDataApi, exportExcelOilDeptApi, getmyDataApi, - getInstituionListApi2 + getInstituionListApi2, + getInstituionListApi7, + getInstituionListApi9 } from "@/api/allOrder"; export default { @@ -173,15 +164,32 @@ export default { beginTime:"", endTime:"", deptType:"3", - + dataRange:[] }, orderStatistics:{ - numberOfStrokes:'0', - theTotalAmountOfTheOrder:'0', - theTotalAmountPaid:'0', - oilDiscounts:'0', - theTotalAmountOfOil:'0', - theTotalAmountOfTheItem:'0', + day:'', + orderMoney:'0', + discountAmount:'0', + refMoney:'0', + accountPending:'0', + trueMoney:'0', + bidBalance:'0', + giftBalance:'0', + memberMoney:'0', + repaidAmount:'0', + newNum:'0', + }, + orderStatisticsAll:{ + orderMoney:'0', + discountAmount:'0', + refMoney:'0', + accountPending:'0', + trueMoney:'0', + bidBalance:'0', + giftBalance:'0', + memberMoney:'0', + repaidAmount:'0', + newNum:'0', }, total:0, timeDifference:1, @@ -193,22 +201,17 @@ export default { start.setMinutes(0) start.setSeconds(0) start.setMilliseconds(0) - this.dateRange = [start,new Date()]; - this.beginTime = start - this.endTime = new Date() - - this.timeDifferenceMilliseconds = this.endTime - this.beginTime; - this.timeDifference = timeDifferenceMilliseconds / (1000 * 60 * 60 * 24); - - console.log("timeDifference",this.timeDifference) + let year = start.getFullYear(); // 获取年份 + let month = String(start.getMonth() + 1).padStart(2, '0'); // 获取月份，月份从0开始所以要+1 + let date = String(start.getDate()).padStart(2, '0'); // 获取日期 + this.queryParams.dataRange = [ year+'-'+month+'-'+date, year+'-'+month+'-'+date]; this.isSysDate = true await this.getDeptList(); this.getList(); - + this.getOrderStatistics(); }, methods:{ getDays(){ - this.timeDifferenceMilliseconds = this.endTime - this.beginTime; this.timeDifference = timeDifferenceMilliseconds / (1000 * 60 * 60 * 24); console.log("timeDifference",this.timeDifference) @@ -228,13 +231,8 @@ export default { // 获取订单统计信息 getOrderStatistics() { - let dateRange = [] - if (this.beginTime && this.endTime) { - dateRange.push(this.beginTime.toLocaleDateString()) - dateRange.push(this.endTime.toLocaleDateString()) - } - getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{ - this.orderStatistics = res.data + getInstituionListApi9(this.queryParams).then(res=>{ + this.orderStatisticsAll = res.data }) }, async getDeptList() { @@ -245,13 +243,8 @@ export default { // 获取列表信息 getList(val){ - let dateRange = [] - if (this.beginTime && this.endTime) { - dateRange.push(this.beginTime.toLocaleDateString()) - dateRange.push(this.endTime.toLocaleDateString()) - } - getInstituionListApi2(this.addDateRange(this.queryParams,dateRange)).then( response => { - this.orderList = response.data.records; + getInstituionListApi7(this.queryParams).then( response => { + this.orderStatistics = response.data.records; this.total = response.data.total; this.isSysDate = false }) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index 2d496ea01..db581caee 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.dto.AllOrderInfoRes; +import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto; import com.fuint.business.order.dto.StatisticsOrderAllDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; @@ -505,4 +506,28 @@ public class AllOrderInfoController extends BaseController { StatisticsOrderAllDto map = allOrderInfoService.getInstituionListApi3(allOrderInfoRes); return getSuccessResult(map); } + + /** + * 订单流水分析 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getInstituionListApi7") + public ResponseObject getInstituionListApi7(AllOrderInfoRes allOrderInfoRes, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + IPage map = allOrderInfoService.getInstituionListApi7(page,allOrderInfoRes); + return getSuccessResult(map); + } + /** + * 订单流水分析 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getInstituionListApi9") + public ResponseObject getInstituionListApi9(AllOrderInfoRes allOrderInfoRes){ + StatisticsOneDayOrderAllDto map = allOrderInfoService.getInstituionListApi9(allOrderInfoRes); + return getSuccessResult(map); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsOneDayOrderAllDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsOneDayOrderAllDto.java new file mode 100644 index 000000000..d536cecff --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsOneDayOrderAllDto.java @@ -0,0 +1,32 @@ +package com.fuint.business.order.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class StatisticsOneDayOrderAllDto implements Serializable { + private static final long serialVersionUID = 1L; + //日期时间 + private String days; + //订单金额 + private String orderMoney; + //优惠金额 + private String discountAmount; + //退款金额 + private String refMoney; + //挂在金额 + private String accountPending; + //实收金额 + private String trueMoney; + //充值金额 + private String bidBalance; + //充值赠送金额 + private String giftBalance; + //会员消费金额 + private String memberMoney; + //归还金额 + private String repaidAmount; + //新增人数 + private String newNum; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index 97aa22672..bb3594b09 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -8,6 +8,7 @@ import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO import com.fuint.business.marketingActivity.cardValueRule.vo.CardValueOrdersVo; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.dto.AllOrderInfoRes; +import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto; import com.fuint.business.order.dto.StatisticsOrderAllDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; @@ -138,4 +139,10 @@ public interface AllOrderInfoMapper extends BaseMapper { StatisticsOrderAllDto getInstituionListApi3(@Param("obj") AllOrderInfoRes allOrderInfoRes, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + IPage getInstituionListApi7(@Param("page") Page page,@Param("obj") AllOrderInfoRes allOrderInfoRes, + @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + StatisticsOneDayOrderAllDto getInstituionListApi9(@Param("obj") AllOrderInfoRes allOrderInfoRes, + @Param("beginTime") String beginTime, @Param("endTime") String endTime); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 53428ed71..15f5c0e28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -1491,4 +1491,105 @@ + + + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java index 7c5c9e553..6077a7235 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.dto.AllOrderInfoRes; +import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto; import com.fuint.business.order.dto.StatisticsOrderAllDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CashierOrder; @@ -217,4 +218,7 @@ AllOrderActivityVo getOneByOrderId(Integer orderId); List getInstituionListApi2(AllOrderInfoRes allOrderInfoRes); StatisticsOrderAllDto getInstituionListApi3(AllOrderInfoRes allOrderInfoRes); + IPage getInstituionListApi7(Page page,AllOrderInfoRes allOrderInfoRes); + + StatisticsOneDayOrderAllDto getInstituionListApi9(AllOrderInfoRes allOrderInfoRes); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index ac9ded358..101af9b0e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -37,6 +37,7 @@ import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.dto.AllOrderInfoRes; +import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto; import com.fuint.business.order.dto.StatisticsOrderAllDto; import com.fuint.business.order.entity.*; import com.fuint.business.order.mapper.AllOrderInfoMapper; @@ -2637,4 +2638,20 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getInstituionListApi7(Page page,AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getInstituionListApi7(page,allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } + @Override + public StatisticsOneDayOrderAllDto getInstituionListApi9(AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getInstituionListApi9(allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } }