From 5a98c707ba692c2dabc2f0d113c897209745bf89 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: Mon, 4 Nov 2024 11:56:55 +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 | 35 ++++ .../views/financialStatement/buy/tab/em.vue | 37 ++--- .../views/financialStatement/buy/tab/gun.vue | 154 +++++++++--------- .../views/financialStatement/buy/tab/oil.vue | 137 ++++++++-------- .../controller/AllOrderInfoController.java | 54 +++++- .../dto/StatisticsSaleOilOrderByGunDto.java | 27 +++ .../order/dto/StatisticsSaleOilOrderDto.java | 26 +++ .../order/mapper/AllOrderInfoMapper.java | 19 ++- .../order/mapper/xml/AllOrderInfoMapper.xml | 118 ++++++++++++-- .../order/service/AllOrderInfoService.java | 13 +- .../service/impl/AllOrderInfoServiceImpl.java | 38 ++++- 11 files changed, 464 insertions(+), 194 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderByGunDto.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderDto.java diff --git a/fuintAdmin/src/api/allOrder.js b/fuintAdmin/src/api/allOrder.js index 9a958d116..9a28ac03f 100644 --- a/fuintAdmin/src/api/allOrder.js +++ b/fuintAdmin/src/api/allOrder.js @@ -302,4 +302,39 @@ export function getInstituionListApi9(query) { }) } +export function getInstituionListApi11(query) { + return request({ + url: 'business/allOrderInfo/getInstituionListApi11', + method: 'get', + params: query + + }) +} +export function getRunningWaterByDataApi13(query) { + return request({ + url: 'business/allOrderInfo/getRunningWaterByDataApi13', + method: 'get', + params: query + + }) +} + +export function getInstituionListApi15(query) { + return request({ + url: 'business/allOrderInfo/getInstituionListApi15', + method: 'get', + params: query + + }) +} +export function getRunningWaterByDataApi17(query) { + return request({ + url: 'business/allOrderInfo/getRunningWaterByDataApi17', + method: 'get', + params: query + + }) +} + + diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue index 9008cf155..7c0b8729f 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.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" + > @@ -33,7 +27,7 @@
- +
0
@@ -42,17 +36,17 @@
- +
0
-
总加油笔数（元）
+
总加油笔数
- +
0
 @@ -62,7 +56,7 @@
- +
0
 @@ -73,7 +67,7 @@
- +
0
@@ -82,7 +76,7 @@
- +
0
@@ -160,6 +154,7 @@ export default { beginTime:"", endTime:"", deptType:"3", + dataRange:[] }, orderStatistics:{ diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue index 6d10ee0be..1feac61b1 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue @@ -5,21 +5,15 @@
- - - 至 - + v-model="queryParams.dataRange" + type="daterange" + range-separator="至" + start-placeholder="开始日期" + end-placeholder="结束日期" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + > @@ -32,8 +26,8 @@
- -
0
+ +
{{orderStatistics.addOilMl}}
@@ -41,8 +35,8 @@
- -
0
+ +
{{orderStatistics.addOilNum}}
@@ -51,8 +45,8 @@
- -
0
+ +
{{orderStatistics.orderNum}}
@@ -61,8 +55,8 @@
- -
0
+ +
{{orderStatistics.discountAmount}}
@@ -72,8 +66,8 @@
- -
0
+ +
{{orderStatistics.payAmount}}
@@ -81,8 +75,8 @@
- -
0
+ +
{{orderStatistics.refMoney}}
@@ -92,32 +86,27 @@
- - - - - - - - + + + + + + + +
-
- - -
- +
@@ -129,7 +118,9 @@ import { getRunningWaterByDataApi, exportExcelOilDeptApi, getmyDataApi, - getInstituionListApi2 + getInstituionListApi2, + getInstituionListApi15, + getRunningWaterByDataApi17 } from "@/api/allOrder"; export default { @@ -154,15 +145,27 @@ export default { beginTime:"", endTime:"", deptType:"3", + dataRange:[] }, orderStatistics:{ - numberOfStrokes:'0', - theTotalAmountOfTheOrder:'0', - theTotalAmountPaid:'0', - oilDiscounts:'0', - theTotalAmountOfOil:'0', - theTotalAmountOfTheItem:'0', + gunName:'0', + addOilMl:'0', + addOilNum:'0', + orderNum:'0', + discountAmount:'0', + refMoney:'0', + payAmount:'0', + }, + soieorderStatistics:{ + days:'', + gunName:'0', + addOilMl:'0', + addOilNum:'0', + orderNum:'0', + discountAmount:'0', + refMoney:'0', + payAmount:'0', }, total:0, timeDifference:1, @@ -174,17 +177,14 @@ 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:{ @@ -209,12 +209,7 @@ 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=>{ + getRunningWaterByDataApi17(this.queryParams).then(res=>{ this.orderStatistics = res.data }) }, @@ -226,17 +221,11 @@ 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; + getInstituionListApi15(this.queryParams).then( response => { + this.soieorderStatistics = response.data.records; this.total = response.data.total; this.isSysDate = false }) - this.getOrderStatistics() }, // 搜索按钮操作 @@ -244,6 +233,7 @@ export default { this.queryParams.page = 1; await this.getDeptList(); this.getList(); + this.getOrderStatistics() }, // 重置按钮操作 @@ -255,8 +245,16 @@ export default { deptType:"3", } - this.beginTime = "" - this.endTime = "" + let start = new Date(); + start.setHours(0) + start.setMinutes(0) + start.setSeconds(0) + start.setMilliseconds(0) + 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.handleQuery(); }, diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue index f6dd39588..6c37da914 100644 --- a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue +++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.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" + > @@ -33,8 +27,8 @@
- -
0
+ +
{{orderStatistics.addOilMl}}
@@ -42,8 +36,8 @@
- -
0
+ +
{{orderStatistics.addOilNum}}
@@ -52,8 +46,8 @@
- -
0
+ +
{{orderStatistics.orderNum}}
@@ -62,8 +56,8 @@
- -
0
+ +
{{orderStatistics.discountAmount}}
@@ -73,8 +67,8 @@
- -
0
+ +
{{orderStatistics.payAmount}}
@@ -82,8 +76,8 @@
- -
0
+ +
{{orderStatistics.refMoney}}
@@ -93,18 +87,18 @@
- - - - - - - - + + + + + + + + @@ -133,7 +127,9 @@ import { getRunningWaterByDataApi, exportExcelOilDeptApi, getmyDataApi, - getInstituionListApi2 + getInstituionListApi2, + getInstituionListApi11, + getRunningWaterByDataApi13 } from "@/api/allOrder"; export default { @@ -158,15 +154,26 @@ export default { beginTime:"", endTime:"", deptType:"3", - + dataRange:[], }, orderStatistics:{ - numberOfStrokes:'0', - theTotalAmountOfTheOrder:'0', - theTotalAmountPaid:'0', - oilDiscounts:'0', - theTotalAmountOfOil:'0', - theTotalAmountOfTheItem:'0', + oilNum:'0', + addOilMl:'0', + addOilNum:'0', + orderNum:'0', + discountAmount:'0', + refMoney:'0', + payAmount:'0', + }, + soieorderStatistics:{ + days:'', + oilNum:'0', + addOilMl:'0', + addOilNum:'0', + orderNum:'0', + discountAmount:'0', + refMoney:'0', + payAmount:'0', }, total:0, timeDifference:1, @@ -178,18 +185,14 @@ 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(){ @@ -213,12 +216,7 @@ 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=>{ + getRunningWaterByDataApi13(this.queryParams).then(res=>{ this.orderStatistics = res.data }) }, @@ -230,17 +228,12 @@ 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; + getInstituionListApi11(this.queryParams).then( response => { + this.soieorderStatistics = response.data.records; this.total = response.data.total; this.isSysDate = false }) - this.getOrderStatistics() + }, // 搜索按钮操作 @@ -248,6 +241,7 @@ export default { this.queryParams.page = 1; await this.getDeptList(); this.getList(); + this.getOrderStatistics() }, // 重置按钮操作 @@ -259,8 +253,15 @@ export default { deptType:"3", } - this.beginTime = "" - this.endTime = "" + start.setHours(0) + start.setMinutes(0) + start.setSeconds(0) + start.setMilliseconds(0) + 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.handleQuery(); }, 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 db581caee..f0c452ef9 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 @@ -3,10 +3,7 @@ package com.fuint.business.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; 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.dto.*; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.entity.CashierOrder; @@ -530,4 +527,53 @@ public class AllOrderInfoController extends BaseController { StatisticsOneDayOrderAllDto map = allOrderInfoService.getInstituionListApi9(allOrderInfoRes); return getSuccessResult(map); } + + /** + * 油品销售统计 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getInstituionListApi11") + public ResponseObject getInstituionListApi11(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.getInstituionListApi11(page,allOrderInfoRes); + return getSuccessResult(map); + } + + /** + * 油品销售统计 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getRunningWaterByDataApi13") + public ResponseObject getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes){ + StatisticsSaleOilOrderDto map = allOrderInfoService.getRunningWaterByDataApi13(allOrderInfoRes); + return getSuccessResult(map); + } + + /** + * 油枪销售统计 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getInstituionListApi15") + public ResponseObject getInstituionListApi15(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.getInstituionListApi15(page,allOrderInfoRes); + return getSuccessResult(map); + } + /** + * 油枪销售统计 + * @param allOrderInfoRes + * @return + */ + @GetMapping("/getRunningWaterByDataApi17") + public ResponseObject getRunningWaterByDataApi17(AllOrderInfoRes allOrderInfoRes){ + StatisticsSaleOilOrderByGunDto map = allOrderInfoService.getRunningWaterByDataApi17(allOrderInfoRes); + return getSuccessResult(map); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderByGunDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderByGunDto.java new file mode 100644 index 000000000..e5b04d863 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderByGunDto.java @@ -0,0 +1,27 @@ +package com.fuint.business.order.dto; + + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class StatisticsSaleOilOrderByGunDto implements Serializable { + private static final long serialVersionUID = 1L; + //统计周期 + private String days; + //加油油号 + private String gunName; + //加油升数 + private String addOilMl; + //加油笔数 + private String addOilNum; + //订单金额 + private String orderNum; + //优惠金额 + private String discountAmount; + //退款金额 + private String refMoney; + //实收金额 + private String payAmount; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderDto.java new file mode 100644 index 000000000..44b6cc85c --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderDto.java @@ -0,0 +1,26 @@ +package com.fuint.business.order.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class StatisticsSaleOilOrderDto implements Serializable { + private static final long serialVersionUID = 1L; + //统计周期 + private String days; + //加油油号 + private String oilNum; + //加油升数 + private String addOilMl; + //加油笔数 + private String addOilNum; + //订单金额 + private String orderNum; + //优惠金额 + private String discountAmount; + //退款金额 + private String refMoney; + //实收金额 + private String payAmount; +} 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 bb3594b09..02b116e1b 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 @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; 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.dto.*; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.entity.HandoverRecord; @@ -145,4 +142,18 @@ public interface AllOrderInfoMapper extends BaseMapper { StatisticsOneDayOrderAllDto getInstituionListApi9(@Param("obj") AllOrderInfoRes allOrderInfoRes, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + IPage getInstituionListApi11(@Param("page") Page page, @Param("obj") AllOrderInfoRes allOrderInfoRes, + @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + StatisticsSaleOilOrderDto getRunningWaterByDataApi13(@Param("obj") AllOrderInfoRes allOrderInfoRes, + @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + IPage getInstituionListApi15(@Param("page") Page page, @Param("obj") AllOrderInfoRes allOrderInfoRes, + @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(@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 15f5c0e28..9cb8273da 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 @@ -1398,10 +1398,10 @@ where 1=1 and aoi.store_id = #{obj.storeId} and aoi.type='1' - = #{beginTime} ]]> + = concat(#{beginTime},' 00:00:00') ]]> - + union all select @@ -1419,10 +1419,10 @@ where 1=1 and aoi.store_id = #{obj.storeId} and aoi.type='4' - = #{beginTime} ]]> + = concat(#{beginTime},' 00:00:00') ]]> - + union all select @@ -1440,10 +1440,10 @@ where 1=1 and aoi.store_id = #{obj.storeId} and aoi.type='6' - = #{beginTime} ]]> + = concat(#{beginTime},' 00:00:00') ]]> - + union all select @@ -1462,10 +1462,10 @@ where 1=1 and aoi.store_id = #{obj.storeId} and aoi.type = '7' - = #{beginTime} ]]> + = concat(#{beginTime},' 00:00:00') ]]> - + @@ -1485,10 +1485,10 @@ where 1=1 and aoi.store_id = #{obj.storeId} and (aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7') - = #{beginTime} ]]> + = concat(#{beginTime},' 00:00:00') ]]> - + @@ -1583,7 +1583,7 @@ LEFT JOIN hang_bill hb on aoi.user_id=hb.id LEFT JOIN mt_user mu on aoi.user_id = mu.id LEFT JOIN card_value_orders cvo on aoi.order_no= cvo.order_no - where 1=1 and aoi.store_id = 157 and + where 1=1 and aoi.store_id = #{obj.storeId} and (aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7') = concat(#{beginTime},' 00:00:00') ]]> @@ -1592,4 +1592,100 @@ + + + + + + + + + + + + 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 6077a7235..78525dfc5 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 @@ -3,10 +3,7 @@ package com.fuint.business.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; 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.dto.*; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.entity.HandoverRecord; @@ -221,4 +218,12 @@ AllOrderActivityVo getOneByOrderId(Integer orderId); IPage getInstituionListApi7(Page page,AllOrderInfoRes allOrderInfoRes); StatisticsOneDayOrderAllDto getInstituionListApi9(AllOrderInfoRes allOrderInfoRes); + + IPage getInstituionListApi11(Page page, AllOrderInfoRes allOrderInfoRes); + + StatisticsSaleOilOrderDto getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes); + + IPage getInstituionListApi15(Page page, AllOrderInfoRes allOrderInfoRes); + + StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(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 101af9b0e..df65d9b61 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 @@ -35,10 +35,7 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelChangeMapper; 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.dto.*; import com.fuint.business.order.entity.*; import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.mapper.CardBalanceChangeMapper; @@ -2654,4 +2651,37 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getInstituionListApi11(Page page, AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getInstituionListApi11(page,allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } + @Override + public StatisticsSaleOilOrderDto getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getRunningWaterByDataApi13(allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } + @Override + public IPage getInstituionListApi15(Page page, AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getInstituionListApi15(page,allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } + + @Override + public StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(AllOrderInfoRes allOrderInfoRes) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId()); + return allOrderInfoMapper.getRunningWaterByDataApi17(allOrderInfoRes, + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0], + allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]); + } }