From 174bfee9d5e1d1745fcfc125888eb3418c77cc70 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Tue, 21 Nov 2023 18:11:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/views/integral/gift/index.vue | 80 +- fuintAdmin/src/views/member/userInfo.vue | 16 +- .../src/views/oilConfig/oilGun/list.vue | 11 +- .../views/oilConfig/oilInventory/order.vue | 51 +- .../src/views/oilConfig/oilPrice/index.vue | 9 +- .../src/views/oilConfig/oilPurchase/list.vue | 2 +- .../api/fuyou/mapper/OilConfigMapper.java | 2 +- .../api/fuyou/mapper/xml/OilConfigMapper.xml | 1 + .../service/impl/OilConfigServiceImpl.java | 3 +- .../mapper/xml/IntegralGiftMapper.xml | 4 +- .../business/integral/vo/IntegralGiftVO.java | 1 + .../impl/CardValueRecordServiceImpl.java | 11 +- .../controller/HandoverRecordController.java | 7 +- .../business/order/entity/HandoverRecord.java | 3 + .../order/mapper/HandoverRecordMapper.java | 20 +- .../order/mapper/xml/HandoverRecordMapper.xml | 169 ++++- .../order/service/HandoverRecordService.java | 2 +- .../impl/HandoverRecordServiceImpl.java | 283 +++++-- .../mapper/OilPresetPricesMapper.java | 2 +- .../mapper/xml/OilGunMapper.xml | 6 +- .../mapper/xml/OilInventoryMapper.xml | 1 + .../mapper/xml/OilNumberMapper.xml | 1 + .../mapper/xml/OilPresetPricesMapper.xml | 2 + .../mapper/xml/OilPurchaseMapper.xml | 2 + .../mapper/xml/OilSuppliersMapper.xml | 5 +- .../service/impl/OilGunServiceImpl.java | 12 +- .../service/impl/OilNumberServiceImpl.java | 4 +- .../impl/OilPresetPricesServiceImpl.java | 2 + .../service/impl/OilPurchaseServiceImpl.java | 2 + .../business/store/mapper/MtStoreMapper.java | 2 +- .../business/store/service/StoreService.java | 2 + .../store/service/impl/StoreServiceImpl.java | 8 + .../dict/mapper/xml/SysDictTypeMapper.xml | 2 +- .../views/cashier/NewComponents/Handover.vue | 479 +++++++++--- .../cashier/NewComponents/HandoverDetails.vue | 50 +- .../cashier/NewComponents/HandoverOnly.vue | 693 ++++++++++++------ 36 files changed, 1452 insertions(+), 498 deletions(-) diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue index 47b5da926..371a96014 100644 --- a/fuintAdmin/src/views/integral/gift/index.vue +++ b/fuintAdmin/src/views/integral/gift/index.vue @@ -322,7 +322,7 @@ - + @@ -423,9 +423,7 @@ - - - + @@ -438,7 +436,7 @@ placeholder="全部" clearable > - + @@ -747,11 +745,12 @@ export default { isRecovery:0, }, - // 商品分类列表 + cvsGoodList:[], // 供应商列表 supplierList:[], + } }, @@ -865,27 +864,26 @@ export default { this.cardFavorableApi(); this.cardExchangeApi(); + this.selectGiftCategory(); - + // 处理图片 let fileList = JSON.parse(data.giftImages); this.giftImages = [], - this.giftImages = fileList; - - console.log( this.giftImages); - this.giftImages.forEach(image=>{ let sp = image.url.split('//') image.url = this.imagePath + '/'+sp[2] }) - console.log("data",data.deliveryMethod); - // data.deliveryMethod = JSON.parse(data.deliveryMethod); - - // 查询兑换卷和优惠券列表 - this.dataForm = data; + this.changeGiftType(this.dataForm.giftType) + this.changeExchange(this.dataForm.exchangeMethod) + this.changeExpressEDIT() + + + console.log(" this.dataForm", this.dataForm) + this.open = true; this.getList(); }, @@ -1001,6 +999,7 @@ export default { }, // 选择礼品类型 changeGiftType(newVal) { + console.log("") let this_ = this if (newVal == '优惠券') { this_.showList.coupon = true @@ -1041,30 +1040,46 @@ export default { this_.showList.jfjq = true } }, - // 快递 + // 快递（处理选择） changeExpress(data,flag){ let this_ = this // express: false, - console.log("data",data) // shippingFee: false + console.log("flag",flag) + console.log("this.dataForm.deliveryMethod",this.dataForm.deliveryMethod) if(flag === 1) { if (!this.dataForm.deliveryMethod) { this.dataForm.deliveryMethod = []; this.showList.express= false } + if (!Array.isArray(this.dataForm.deliveryMethod)) { + this.dataForm.deliveryMethod = JSON.parse(this.dataForm.deliveryMethod); + + } + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // const index = jsonArray.indexOf(data); const index = this.dataForm.deliveryMethod.indexOf(data); if (index === -1) { this.dataForm.deliveryMethod.push(data); + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // jsonArray.push(data) + // this.dataForm.deliveryMethod = jsonArray + console.log("data1",data) + if(data == '物流配送') { this.showList.express= true } } else { - this.dataForm.deliveryMethod.splice(index, 1); + console.log("data2",data) + this.dataForm.deliveryMethod.splice(index, 1) + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // jsonArray.splice(index, 1); + // this.dataForm.deliveryMethod = JSON.stringify(jsonArray) + if(data == '物流配送') { this.showList.express= false } } - console.log("data",this.dataForm.deliveryMethod) } else { if (data == '包邮') { this.showList.shippingFee= false @@ -1073,6 +1088,31 @@ export default { } } }, + + // 快递 修改时处理 + changeExpressEDIT(){ + if (!this.dataForm.deliveryMethod) { + this.dataForm.deliveryMethod = []; + this.showList.express= false + } + if(!this.dataForm.expressShippingFee) { + this.dataForm.expressShippingFee= '' + this.showList.shippingFee= false + } + let this_ = this + if (!Array.isArray(this_.dataForm.deliveryMethod)) { + this_.dataForm.deliveryMethod = JSON.parse(this_.dataForm.deliveryMethod); + } + if (this_.dataForm.deliveryMethod.includes("物流配送")) { + this.showList.express= true + + } + if (this_.dataForm.expressShippingFee == "统一运费") { + this.showList.shippingFee= true + } + + }, + // 点击按钮处理 handleIsopenSelect() { diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 75b304e74..c2b65844a 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -337,7 +337,7 @@ + @input="valueAmoutChange(cardValueForm.amount)"> @@ -1017,6 +1017,18 @@ export default { }, valueAmoutChange(data) { + + + this.cardValueForm.points = '' + this.cardValueForm.bidBalance ='' + this.cardValueForm.giftBalance ='' + this.cardValueForm.growthValue = '' + this.cardValueForm.rechargeBalance = '' + + this.cardValueForm.royaltyType = '' + this.cardValueForm.percentageCommissions = '' + this.cardValueForm.amountCommission = '' + this.cardValueForm.rechargeBalance = data if (this.cardValueList.length > 0){ @@ -1033,6 +1045,7 @@ export default { this.cardValueForm.percentageCommissions = change.percentageCommissions this.cardValueForm.amountCommission = change.amountCommission + // 计算员工提成金额 if (change.royaltyType === "3") { // 当按比例提成时 计算对应的金额 @@ -1047,6 +1060,7 @@ export default { }) } console.log("data",data) + console.log("this.cardValueForm",this.cardValueForm) }, // 存油卡查询 getCardFuelDieselList() { diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue index cfe60e78f..3965c87b8 100644 --- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue @@ -163,6 +163,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank"; this.$forceUpdate() }, getList() { + this.gunList = [] getGunApi().then(response => { this.gunList = response.data; }) @@ -224,7 +225,8 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank"; if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.dialogVisible = false; - // this.getList(); + this.getList(); + }else { } @@ -235,17 +237,18 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank"; if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.dialogVisible = false; - // this.getList(); + this.getList(); + this.dialogVisible = false + } }); } - this.dialogVisible = false } else { return false; } }); - this.getList(); + // this.getList(); }, chooseName() { var this_ = this diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue index 151f26752..a4231627e 100644 --- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue +++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue @@ -401,15 +401,14 @@ export default { // 改变数字时 change(data) { + // new BigNumber + console.log("data",data) // 库存差异升数 data.stockDifference = data.inventoryVolume - data.currentInventoryVolume // 盈亏金额 - data.profitLossAmount = data.inventoryVolume * data.stockDifference + data.profitLossAmount = data.stockDifference * data.currentAveragePrice this.sumMethod(this.orderList) - // 进行保存 - // this.orderForm = data - // this.edit() }, @@ -441,20 +440,24 @@ export default { // 添加油罐到订单列表 addOrder () { let this_ = this - // let oilInventoryOrder = [] - // - // this.multipleSelection.forEach(mul=>{ - // let now = { - // tankId: mul.id, - // numberId: mul.numberId, - // currentAveragePrice: mul.discountedPrice, - // currentInventoryVolume: mul.storedQuantity - // } - // oilInventoryOrder.push(now) - // }) - console.log("this.multipleSelection",this.multipleSelection) this.multipleSelection.forEach(mul=>{ + const isDuplicate = false + if (this.orderList.length > 0) { + isDuplicate = this.orderList.some(order => order.tankId === mul.id); + } + + if (isDuplicate || isDuplicate == '') { + console.log("isDuplicate222") + + this.$message({ + message: '油罐已经存在，请重新选择', + type: 'warning' + }); + this.multipleSelection = [] + return; + } + let now = { tankId: mul.id, tankName: mul.tankName, @@ -466,21 +469,13 @@ export default { } this_.orderList.push(now) }) - // this_.getList(); - this_.open = false + this.multipleSelection = [] + + this_.open = false this.numberOfTanks = this.numberOfTanks+1 this_.sumMethod(this_.orderList); - - // this_.orderList - - // insertBatchInventoryOrderApi(oilInventoryOrder).then(response => { - // this_.$modal.msgSuccess("保存成功"); - // this_.getList(); - // this_.open = false - // }).catch(response=>{ - // - // }) + }, // 表格选择器 handleSelectionChange(val) { diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue index 12ad79e1b..a194928e7 100644 --- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue +++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue @@ -311,7 +311,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -631,7 +631,8 @@ import { if (valid) { insertOilNumber(this.oilNumber).then( response => { var list = response.data - if (list == 0) { + if (list < 0) { + this.getList(); this.$modal.msgWarning("有重复油号"); }else if(list > 0){ this.$modal.msgSuccess("新增油号成功"); @@ -639,7 +640,6 @@ import { this.getList(); } - console.log("updateOilNumber",list) }); } }) @@ -655,6 +655,7 @@ import { updateOilNumber(this_.oilNumber).then( response => { var list = response.data if ( list < 0) { + this.getList(); this.$modal.msgWarning("油品重复"); } else { this.getList(); diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue index c4f5b0895..973adee7c 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue @@ -20,7 +20,7 @@ - { * 查询油品配置列表信息 * @return */ - public List selectOilConfigList(); + public List selectOilConfigList(Integer storeId); /** * 根据id查询支付配置信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml index 807e4d766..c7a4e7eb6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml @@ -8,6 +8,7 @@ @@ -119,7 +131,7 @@ limit 1 insert into handover_record(staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by,status,type) - values (#{staffId}, #{recordData}, #{startTime}, #{createTime}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{status},{type}) + values (#{staffId}, #{recordData}, #{startTime}, #{createTime}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{status},#{type}) @@ -241,6 +253,8 @@ limit 1 SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount, SUM(IF(order_status='refund', pay_amount, 0)) AS refundAmount FROM oil_order + where store_id = #{storeId} + and create_time BETWEEN #{startTime} AND #{endTime} GROUP BY pay_type UNION ALL @@ -251,6 +265,8 @@ limit 1 SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount, SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount FROM card_value_record + where store_id = #{storeId} + and create_time BETWEEN #{startTime} AND #{endTime} GROUP BY payment_type UNION ALL @@ -261,6 +277,8 @@ limit 1 SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount, SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount FROM card_fuel_record + where store_id = #{storeId} + and create_time BETWEEN #{startTime} AND #{endTime} GROUP BY payment_type UNION ALL @@ -271,10 +289,157 @@ limit 1 SUM(IF(status='paid', pay_amount, 0)) AS paidAmount, SUM(IF(status='refund', pay_amount, 0)) AS refundAmount FROM mt_order - GROUP BY pay_type; + where store_id = #{storeId} + and create_time BETWEEN #{startTime} AND #{endTime} + GROUP BY pay_type + + UNION ALL + + SELECT + 'point' AS flag, + payment_type AS payType, + SUM(IF(status='status', amount, 0)) AS paidAmount, + SUM(IF(status='refund', amount, 0)) AS refundAmount + FROM integral_orders + where store_id = #{storeId} + and create_time BETWEEN #{startTime} AND #{endTime} + GROUP BY payment_type + having payment_type is not null + + + + + + + + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HandoverRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HandoverRecordService.java index 973fad66f..0b2720237 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HandoverRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HandoverRecordService.java @@ -59,7 +59,7 @@ public interface HandoverRecordService { */ boolean deleteById(Integer id); - public Map> handover(); + public Map handover(); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java index 7067d1104..bc284c803 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java @@ -3,12 +3,22 @@ package com.fuint.business.order.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.member.entity.LJStaff; +import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.order.entity.HandoverRecord; import com.fuint.business.order.mapper.HandoverRecordMapper; -import com.fuint.business.order.mapper.OilOrderMapper; import com.fuint.business.order.service.HandoverRecordService; import com.fuint.business.store.entity.MtStore; import com.fuint.business.store.mapper.MtStoreMapper; +import com.fuint.business.store.service.StoreService; +import com.fuint.business.userManager.mapper.LJUserMapper; +import com.fuint.business.userManager.vo.LJUserVo; +import com.fuint.framework.exception.BusinessCheckException; +import com.fuint.system.dict.entity.SysDictData; +import com.fuint.system.dict.entity.SysDictType; +import com.fuint.system.dict.service.ISysDictDataService; +import com.fuint.system.dict.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fuint.common.util.TokenUtil; import io.lettuce.core.dynamic.annotation.Param; @@ -23,6 +33,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,9 +49,14 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { @Resource private HandoverRecordMapper handoverRecordMapper; @Resource - private MtStoreMapper mtStoreMapper; + private StoreService storeService; @Resource - private OilOrderMapper oilOrderMapper; + private LJUserMapper ljUserMapper; + @Resource + ILJStaffService iljStaffService; + @Resource + ISysDictDataService iSysDictDataService; + /** * 通过ID查询单条数据 @@ -115,19 +131,22 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { } @Override - public Map> handover() { + public Map handover() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); -// MtStore mtStore = mtStoreMapper.queryStoreById(nowAccountInfo.getStoreId()); + MtStore mtStore = new MtStore(); + try { + mtStore = storeService.queryStoreById2(nowAccountInfo.getStoreId()); + } catch (BusinessCheckException e) { + e.printStackTrace(); + } // 获取当前日期 LocalDate today = LocalDate.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - // 获取当前日期的零点时间 - LocalDateTime midnight = today.atStartOfDay(); // 格式化当前时间 String formattedEndTime = LocalDateTime.now().format(formatter); - Map> handoverMap = new HashMap<>(); + Map handoverMap = new HashMap<>(); String startTime = "2023-01-01 12:12:12"; HandoverRecord handoverRecord = selectByTime(); @@ -136,98 +155,230 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { startTime = sdf.format(handoverRecord.getEndTime()); } + LJStaff ljStaff = iljStaffService.selectStaffById(nowAccountInfo.getStaffId()); + String handover = iSysDictDataService.selectDictLabel("handover", ljStaff.getHandoverMode()); + String handoverType = "未知"; + if (!ObjectUtil.isEmpty(handover)) { + handoverType = handover; + } // 填充 baseInfo - Map baseInfo = new HashMap<>(); -// baseInfo.put("storeName", mtStore.getName()); + Map baseInfo = new HashMap<>(); + baseInfo.put("storeName", mtStore.getName()); baseInfo.put("realName", nowAccountInfo.getRealName()); - baseInfo.put("handoverType", "门店统一交班"); + baseInfo.put("handoverType", handoverType); baseInfo.put("startTime", startTime); baseInfo.put("endTime", formattedEndTime); + baseInfo.put("handoverPrem", ljStaff.getHandoverPrem()); // 交班权限 + baseInfo.put("handoverOut", ljStaff.getHandoverOut()); // 交班是否退出 handoverMap.put("baseInfo",baseInfo); // 获取订单汇总 - Map orderSummaryMap = orderSummary(startTime, formattedEndTime); + Map orderSummaryMap = orderSummary(startTime, formattedEndTime); handoverMap.put("orderSummary",orderSummaryMap); // 支付方式汇总 - Map paymentAggregationMap = paymentAggregation(startTime, formattedEndTime); + List> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime); handoverMap.put("paymentAggregation",paymentAggregationMap); - - // 退款汇总 - // 实收汇总 - // 油品订单 - // 商品订单 - // 普通订单 - // 会员储值 // 油号统计 - // 优惠统计 + List> oilNumberStatisticsMap = oilNumberStatistics(startTime, formattedEndTime); + handoverMap.put("oilNumberStatistics",oilNumberStatisticsMap); // 油枪统计 + List> greaseGunStatisticsMap = greaseGunStatistics(startTime, formattedEndTime); + handoverMap.put("greaseGunStatistics",greaseGunStatisticsMap); // 员工统计 + List> employeeStatisticsMap = employeeStatistics(startTime, formattedEndTime); + handoverMap.put("employeeStatistics",employeeStatisticsMap); + // 挂账详情 + List> billingDetailsMap = billingDetails(startTime, formattedEndTime); + handoverMap.put("billingDetails",billingDetailsMap); + // 挂账归还 + List> returnedToTheAccountMap = returnedToTheAccount(startTime, formattedEndTime); + handoverMap.put("returnedToTheAccount",returnedToTheAccountMap); // 合计 return handoverMap; } - public Map orderSummary(String startTime, String endTime) { + + public Map orderSummary(String startTime, String endTime) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // 油品订单(订单) 油品订单(退款) 油品订单(实收) 油品优惠(实收) 油品交易(实收) - Map oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + Map oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); // 会员储值(订单) 会员储值(退款) 会员储值(实收) 储值赠送(订单) 储值赠送(退款) 储值赠送(实际) - Map cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); - Map fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + Map cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + Map fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); // 普通收款(订单) 普通收款(退款) 普通收款(实收) - Map goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + Map goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + if (!ObjectUtil.isEmpty(oilOrderStatistics)) { + if(!ObjectUtil.isEmpty(cardOrderStatistics)) { + oilOrderStatistics.putAll(cardOrderStatistics); + } + if(!ObjectUtil.isEmpty(fuelOrderStatistics)) { + oilOrderStatistics.putAll(fuelOrderStatistics); + } + if(!ObjectUtil.isEmpty(goodsOrderStatistics)) { + oilOrderStatistics.putAll(goodsOrderStatistics); + } + } - if(!ObjectUtil.isEmpty(cardOrderStatistics)) { - oilOrderStatistics.putAll(cardOrderStatistics); - } - if(!ObjectUtil.isEmpty(fuelOrderStatistics)) { - oilOrderStatistics.putAll(fuelOrderStatistics); - } - if(!ObjectUtil.isEmpty(goodsOrderStatistics)) { - oilOrderStatistics.putAll(goodsOrderStatistics); - } return oilOrderStatistics; } - public Map paymentAggregation(String startTime, String endTime) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId()); - // 共有四个 转为普通map - Map allAggreMap = new HashMap<>(); - Map allRefundMap = new HashMap<>(); - Map oilMap = new HashMap<>(); - Map goodsMap = new HashMap<>(); - Map cardMap = new HashMap<>(); - if (!ObjectUtil.isEmpty(paymentAggregation)) { - for (Map stringStringMap : paymentAggregation) { + /** + * 汇总统计 + */ - // 计算退款汇总 -// if ( allRefundMap.containsKey("refALl"+stringStringMap.get("payType"))) { -// allRefundMap.put("refALl"+stringStringMap.get("payType"), -// (new BigDecimal( stringStringMap.get("refundAmount")).add(new BigDecimal(stringStringMap.get("refundAmount")))).toString()); -// }else { -// allAggreMap.put("refALl"+stringStringMap.get("payType"), allRefundMap.get(stringStringMap.get("refundAmount"))); -// } + public List> paymentAggregation(String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId()); + List> allRefundMapList = new ArrayList<>(); + if (!ObjectUtil.isEmpty(paymentAggregation)) { + for (Map stringStringMap : paymentAggregation) { + // 汇总 + aggregateCalculations(allRefundMapList, stringStringMap); + } + } + if (!ObjectUtil.isEmpty(allRefundMapList)){ + paymentAggregation.addAll(allRefundMapList); + } + return paymentAggregation; + } + + /** + * 汇总 + */ + public List> aggregateCalculations(List> mapList,Map map) { + Map returnMap = new HashMap<>(); + + boolean flag = true; + for (Map stringObjectMap : mapList) { + if (map.get("payType").equals(stringObjectMap.get("payType"))) { + BigDecimal paidAmount = new BigDecimal(stringObjectMap.get("paidAmount").toString()).add(new BigDecimal(map.get("paidAmount").toString())); + BigDecimal refundAmount = new BigDecimal(stringObjectMap.get("refundAmount").toString()).add(new BigDecimal(map.get("refundAmount").toString())); + stringObjectMap.put("paidAmount",paidAmount.toString()); + stringObjectMap.put("refundAmount",refundAmount.toString()); + flag = false; + } + } + if (flag) { + returnMap.put("flag","all"); + returnMap.put("payType",map.get("payType")); + returnMap.put("paidAmount",map.get("paidAmount").toString()); + returnMap.put("refundAmount",map.get("refundAmount").toString()); + mapList.add(returnMap); + } + return mapList; + } + + public Map paymentAggregation2(String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId()); + // 共有四个 转为普通map + Map allAggreMap = new HashMap<>(); + Map allRefundMap = new HashMap<>(); + Map oilMap = new HashMap<>(); + Map goodsMap = new HashMap<>(); + Map cardMap = new HashMap<>(); + if (!ObjectUtil.isEmpty(paymentAggregation)) { + + for (Map stringStringMap : paymentAggregation) { + + String payType = stringStringMap.get("payType").toString(); + // 退款汇总 + String refALlKey = "refALl" + payType; + summaryExtraction(stringStringMap, allRefundMap, refALlKey); // 总汇总 -// if ( allAggreMap.containsKey("agreALL"+stringStringMap.get("payType"))) { -// allAggreMap.put("agreALL"+stringStringMap.get("payType"), -// (new BigDecimal( stringStringMap.get("paidAmount")).add(new BigDecimal(stringStringMap.get("paidAmount")))).toString()); -// }else { -// allAggreMap.put("agreALL"+stringStringMap.get("payType"), allAggreMap.get(stringStringMap.get("paidAmount"))); -// } - + String agreALLKey = "agreALL" + payType; + summaryExtraction(stringStringMap, allAggreMap, agreALLKey); if ("oil".equals(stringStringMap.get("flag"))){ // 油品订单汇总 - - - }else if ("card".equals(stringStringMap.get("flag"))) { + String oilKey = "oil" + payType; + summaryExtraction(stringStringMap, oilMap, oilKey); + }else if ("goods".equals(stringStringMap.get("flag"))) { // 商品订单汇总 - }else if ("fuel".equals(stringStringMap.get("flag")) || "goods".equals(stringStringMap.get("flag")) ) { + String goodsKey = "goods" + payType; + summaryExtraction(stringStringMap, goodsMap, goodsKey); + }else if ("fuel".equals(stringStringMap.get("flag")) || "card".equals(stringStringMap.get("flag")) ) { // 会员储值汇总 + String cardKey = "card" + payType; + summaryExtraction(stringStringMap, cardMap, cardKey); } } } - return null; + + if (!ObjectUtil.isEmpty(allAggreMap)) { + allRefundMap.putAll(allAggreMap); + } + if (!ObjectUtil.isEmpty(allRefundMap)) { + allRefundMap.putAll(allRefundMap); + } + if (!ObjectUtil.isEmpty(oilMap)) { + allRefundMap.putAll(oilMap); + } + if (!ObjectUtil.isEmpty(goodsMap)) { + allRefundMap.putAll(goodsMap); + } + if (!ObjectUtil.isEmpty(cardMap)) { + allRefundMap.putAll(cardMap); + } + return allRefundMap; } + + /** + * 油号统计 + */ + public List> oilNumberStatistics (String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> oilNumberStatistics = handoverRecordMapper.oilNumberStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + return oilNumberStatistics; + } + + /** + * 油枪统计 + */ + public List> greaseGunStatistics (String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> greaseGunStatistics = handoverRecordMapper.greaseGunStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + return greaseGunStatistics; + } + + /** + * 员工统计 + */ + public List> employeeStatistics (String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> employeeStatistics = handoverRecordMapper.employeeStatistics(startTime, endTime, nowAccountInfo.getStoreId()); + return employeeStatistics; + } + + // 挂账详情 + public List> billingDetails (String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> billingDetails = handoverRecordMapper.billingDetails(startTime, endTime, nowAccountInfo.getStoreId()); + return billingDetails; + } + // 挂账归还 + public List> returnedToTheAccount (String startTime, String endTime) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + List> returnedToTheAccount = handoverRecordMapper.returnedToTheAccount(startTime, endTime, nowAccountInfo.getStoreId()); + return returnedToTheAccount; + } + + /** + * 汇总抽取 + */ + public Map summaryExtraction(Map sourceMap,Map map,String key) { + if (map.containsKey(key)) { + // 如果已经包含了该 payType，则累加退款金额 + BigDecimal currentRefundAmount = new BigDecimal(map.get(key).toString()); + BigDecimal newRefundAmount = new BigDecimal(sourceMap.get("paidAmount").toString()); + + map.put(key, currentRefundAmount.add(newRefundAmount).toString()); + } else { + // 如果还没有该 payType，则直接添加新记录 + map.put(key, sourceMap.get("paidAmount").toString()); + } + return map; + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilPresetPricesMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilPresetPricesMapper.java index f8666193c..722d1c0b2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilPresetPricesMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilPresetPricesMapper.java @@ -19,7 +19,7 @@ public interface OilPresetPricesMapper extends BaseMapper { * @param page * @return */ - public IPage selectOilPresetPricesList(Page page, @Param("oilNumber") OilPresetPrices presetPrices); + public IPage selectOilPresetPricesList(Page page, @Param("presetPrices") OilPresetPrices presetPrices); /** * 根据id查询员工信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml index 85e016e68..6a4d9fc35 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml @@ -107,8 +107,10 @@ from oil_number onm left join oil_name name on onm.oil_name = name.id + onm.state = '启用' + - onm.store_id = #{storeId} + and onm.store_id = #{storeId} @@ -117,9 +119,9 @@ from oil_gun where gun_name = #{oilGun.gunName} - and tank_id = #{oilGun.tankId} and store_id = #{oilGun.storeId} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilInventoryMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilInventoryMapper.xml index d3fb85171..2be91c3ce 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilInventoryMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilInventoryMapper.xml @@ -155,6 +155,7 @@ LEFT JOIN mt_staff ms1 ON op.creator = ms1.id LEFT JOIN mt_staff ms2 ON op.reviewer = ms2.id + op.store_id = #{oilInventory.storeId} and op.status = #{oilInventory.status} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml index 39d5f44e7..c9f2ce79c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml @@ -105,6 +105,7 @@ left join oil_name name on onm.oil_name = name.id onm.store_id = #{storeId} + and onm.state = '启用' diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml index 56e8b6cf7..9fe242be9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml @@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPurchaseMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPurchaseMapper.xml index f9c60163c..e332d7830 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPurchaseMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPurchaseMapper.xml @@ -172,6 +172,8 @@ LEFT JOIN mt_staff ms1 ON op.creator = ms1.id LEFT JOIN mt_staff ms2 ON op.reviewer = ms2.id + op.store_id = #{oilPurchase.storeId} + and created_at >= #{oilPurchase.beginTime} and created_at <= #{oilPurchase.endTime} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilSuppliersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilSuppliersMapper.xml index bc8ade777..224aaa66f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilSuppliersMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilSuppliersMapper.xml @@ -30,6 +30,7 @@ id, supplier_name, contact_person, contact_phone, contact_address, remarks, create_time, update_time, create_by, update_by from oil_suppliers + store_id = #{oilSuppliers.storeId} and id = #{oilSuppliers.id} @@ -60,9 +61,7 @@ and update_by = #{oilSuppliers.updateBy} - - and store_id = #{oilSuppliers.storeId} - + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java index 16c8500b4..672d03069 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java @@ -91,8 +91,8 @@ public class OilGunServiceImpl implements OilGunService { AccountInfo accountInfo = TokenUtil.getNowAccountInfo(); oilGun.setStoreId(accountInfo.getStoreId()); oilGun.setCreateBy(accountInfo.getStaffId().toString()); - boolean check = checkData(oilGun); - if (check) { + int i = checkData(oilGun); + if (i>0) { return false; } oilGun.setCreateBy(accountInfo.getId().toString()); @@ -101,9 +101,9 @@ public class OilGunServiceImpl implements OilGunService { } // 判断是否有同一名称的数据 - public boolean checkData(OilGun oilGun) { + public int checkData(OilGun oilGun) { List oilGunList = oilGunDao.checkData(oilGun); - return oilGunList.size() > 1; + return oilGunList.size(); } /** @@ -116,8 +116,8 @@ public class OilGunServiceImpl implements OilGunService { public boolean update(OilGun oilGun) { AccountInfo accountInfo = TokenUtil.getNowAccountInfo(); oilGun.setStoreId(accountInfo.getStoreId()); - boolean check = checkData(oilGun); - if (check) { + int i = checkData(oilGun); + if (i>1) { return false; } oilGun.setUpdateBy(accountInfo.getId().toString()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java index 9320b7b12..13834b3fb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java @@ -49,8 +49,8 @@ public class OilNumberServiceImpl extends ServiceImpl 1) { - return 0; + if ( i >= 1) { + return -1; } return baseMapper.insertOilNumber(oilNumber); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java index 4c80ee89d..a74d26f17 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java @@ -41,6 +41,8 @@ public class OilPresetPricesServiceImpl extends ServiceImpl selectOilPresetPricesList(Page page, OilPresetPrices presetPrices) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + presetPrices.setStoreId(nowAccountInfo.getStoreId()); return baseMapper.selectOilPresetPricesList(page, presetPrices); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPurchaseServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPurchaseServiceImpl.java index 73978ee84..6f30e2b13 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPurchaseServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPurchaseServiceImpl.java @@ -58,6 +58,8 @@ public class OilPurchaseServiceImpl implements OilPurchaseService { */ @Override public IPage queryByPage(@Param("page") Page page, @Param("OilPurchase") OilPurchase oilPurchase) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + oilPurchase.setStoreId(nowAccountInfo.getStoreId()); return oilPurchaseDao.queryAllByLimit(page, oilPurchase); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java index 3e41a384e..7fb814b77 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java @@ -17,7 +17,7 @@ public interface MtStoreMapper extends BaseMapper { MtStore queryStoreByName(@Param("name") String name); - public MtStore queryStoreById(@Param("id") Integer id); +// public MtStore queryStoreById(@Param("id") Integer id); List findStoresByIds(@Param("ids") List ids); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java index 2b2f4ab18..2f794eafc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java @@ -48,6 +48,8 @@ public interface StoreService extends IService { */ MtStore queryStoreById(Integer id) throws BusinessCheckException; + MtStore queryStoreById2(Integer id) throws BusinessCheckException; + /** * 根据店铺id列表获取店铺信息 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java index 9ea729a1f..c0045491b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java @@ -158,6 +158,14 @@ public class StoreServiceImpl extends ServiceImpl implem return mtStoreMapper.selectById(id); } + @Override + public MtStore queryStoreById2(Integer id) { + if (id == null) { + return null; + } + return mtStoreMapper.selectById(id); + } + /** * 获取系统默认店铺 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/mapper/xml/SysDictTypeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/mapper/xml/SysDictTypeMapper.xml index 1779a3d65..b7f6e8720 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/mapper/xml/SysDictTypeMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/mapper/xml/SysDictTypeMapper.xml @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_type = #{dictType} limit 1 - + delete from sys_dict_type where dict_id = #{dictId} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue index 6bdfc6ad0..839cd2191 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue @@ -15,18 +15,18 @@
交班方式:
-
门店统一交班
+ {{handoverList && handoverList.baseInfo ? handoverList.baseInfo.handoverType : '未知'}}
开始时间:
-
{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '/--/' }}
+
{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '-' }}
结束时间:
-
{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '/--/' }}
+
{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '-' }}
@@ -139,10 +139,14 @@
支付方式
退款金额
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.refundAmount}}
+
-
+
合计
-
￥2164.55
+
￥{{refundAggregateTotal}}
@@ -152,26 +156,14 @@
支付方式
金额
-
-
现金
-
￥2164.55
-
-
-
储值卡
-
￥2164.55
-
-
-
加油金
-
￥2164.55
-
-
-
银行转1
-
￥2164.55
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.paidAmount}}
合计
-
￥2164.55
+
￥{{totalTotalOfActualReceipts}}
@@ -181,26 +173,14 @@
支付方式
金额
-
-
现金
-
￥2164.55
-
-
-
储值卡
-
￥2164.55
-
-
-
加油金
-
￥2164.55
-
-
-
银行转1
-
￥2164.55
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.paidAmount}}
合计
-
￥2164.55
+
￥{{totalOilOrders}}
@@ -209,40 +189,66 @@
支付方式
金额
- -
-
合计
-
￥0.00
-
- -
-
普通订单
-
-
支付方式
-
金额
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.paidAmount}}
合计
-
￥0.00
+
￥{{totalOfProductOrders}}
+ + + + + + + + + + + + + + + +
会员储值
支付方式
金额
-
-
现金
-
￥888.88
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.paidAmount}}
合计
-
￥888.88
+
￥{{totalMemberStoredValue}}
+ +
+
积分商城
+
+
支付方式
+
金额
+
+
+
{{calculateThePaymentMethod(item.payType)}}
+
￥{{item.paidAmount}}
+
+ +
+
合计
+
￥{{pointsMallStatistics}}
+
+
+
油号统计
@@ -251,23 +257,16 @@
升数
金额
-
-
92#
-
9
-
1447.03
-
￥888.88
+
+
{{item.oilName}}
+
{{item.numberOfDeals}}
+
{{item.oilNum}}
+
￥{{item.paidAmount}}
-
-
92#
-
9
-
1447.03
-
￥888.88
-
-
合计
-
￥888.88
+
￥{{totalOilNumberStatistics}}
@@ -276,14 +275,14 @@
油品
金额
-
-
92#
-
￥888.88
+
+
{{item.oilName}}
+
{{item.paidDiscount}}
合计
-
￥888.88
+
￥{{discountStatisticsTotal}}
@@ -294,23 +293,16 @@
升数
金额
-
-
一号枪
-
9
-
1447.03
-
￥888.88
+
+
{{item.gunName}}
+
{{item.numberOfDeals}}
+
{{item.oilNum}}
+
￥{{item.paidAmount}}
-
-
二号枪
-
9
-
1447.03
-
￥888.88
-
-
合计
-
￥888.88
+
￥{{totalOfOilGunStatistics}}
@@ -319,35 +311,66 @@
员工姓名
笔数
-
金额
-
-
一号员工
-
9
- -
￥888.88
+
+
{{item.name}}
+
{{item.numberOfDeals}}
+
￥{{item.paidAmount}}
-
-
二号员工
-
9
- -
￥888.88
-
-
合计
-
￥888.88
+
￥{{totalOfEmployeeStatistics}}
+ +
+
挂账统计
+ 挂账详情 +
+
挂账单位
+
笔数
+
金额
+
+
+
{{item.name}}
+
{{item.numberOfDeals}}
+
￥{{item.amount}}
+
+ +
+
合计
+
￥{{statisticsOfAccountDetails}}
+
+ + + 归还详情 +
+
挂账单位
+
笔数
+
金额
+
+
+
{{item.name}}
+
{{item.numberOfDeals}}
+
￥{{item.amount}}
+
+ +
+
合计
+
￥{{postedAccountReturnStatistics}}
+
+
+ +
-
交班
+
交班
云打印
本地打印
交班记录
@@ -360,12 +383,15 @@