From 50cd7a5a34763438f2ecd833a59ad7951b682f50 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Tue, 27 Feb 2024 14:03:47 +0800
Subject: [PATCH 1/6] no message
---
.../src/api/convenienceStore/inventory.js | 8 ++++
.../convenienceStore/inventory/details.vue | 30 +++++++++---
.../src/views/handover/HandoverDetails.vue | 2 +-
.../src/views/oilConfig/oilGun/list.vue | 2 +-
.../oilConfig/oilPurchase/purchaseOrder.vue | 2 +-
fuintAdmin/src/views/staff/list.vue | 3 +-
.../MtInventoryDetailsController.java | 7 +++
.../service/MtInventoryDetailsService.java | 2 +
.../impl/MtInventoryDetailsServiceImpl.java | 46 ++++++++++++++++++-
.../vo/MtInventoryDetailsVO.java | 3 +-
.../business/order/mapper/LJOrderMapper.java | 2 +-
.../order/mapper/xml/LJOrderMapper.xml | 3 ++
.../order/mapper/xml/OilOrderMapper.xml | 10 ++--
.../order/service/LJOrderService.java | 2 +-
.../service/impl/LJOrderServiceImpl.java | 4 +-
.../service/impl/UserBalanceServiceImpl.java | 10 ++--
.../dept/service/impl/SysDeptServiceImpl.java | 6 ++-
.../cashier/NewComponents/HandoverDetails.vue | 22 ++++-----
.../cashier/NewComponents/HandoverOnly.vue | 8 ++--
.../views/cashier/NewComponents/Integral.vue | 13 +++---
20 files changed, 137 insertions(+), 48 deletions(-)
diff --git a/fuintAdmin/src/api/convenienceStore/inventory.js b/fuintAdmin/src/api/convenienceStore/inventory.js
index 860babb5c..8da54f2f3 100644
--- a/fuintAdmin/src/api/convenienceStore/inventory.js
+++ b/fuintAdmin/src/api/convenienceStore/inventory.js
@@ -97,3 +97,11 @@ export function exportExcelApi(data) {
data: data
})
}
+
+export function getSalesByMtInventoryApi(data) {
+ return request({
+ url: 'business/convenience/mtInventoryDetails/getSalesByMtInventory',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
index b4ee6357d..d27dcc0fd 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
@@ -90,12 +90,17 @@
- {{scope.row.goodsSales?scope.row.goodsSales:'--'}}
+ {{scope.row.goodsSales?scope.row.goodsSales:'0'}}
- {{scope.row.inventorySales?scope.row.inventorySales:'--'}}
+ {{scope.row.inventorySales?scope.row.inventorySales:'0'}}
+
+
+
+
+ {{scope.row.exchangeSales?scope.row.exchangeSales:'0'}}
@@ -241,10 +246,10 @@ import {
editInventoryApi,
addInventoryApi,
batchProcessingApi,
- auditInventoryApi ,
+ auditInventoryApi,
storageInventoryApi,
abolitionInventoryApi,
- exportExcelApi
+ exportExcelApi, getSalesByMtInventoryApi
} from "@/api/convenienceStore/inventory";
@@ -480,11 +485,11 @@ export default {
})
},
- addCommodity () {
+ async addCommodity () {
let this_ = this
let sum = 0;
- this.multipleSelection.forEach(mul=>{
+ for (const mul of this.multipleSelection) {
let flag = true;
this_.detailsList.forEach(det=>{
if (mul.id == det.goodsId) {
@@ -493,6 +498,12 @@ export default {
}
})
if(flag) {
+
+ let getPurchaseByTankIdData
+ await getSalesByMtInventoryApi().then(res=>{
+ getPurchaseByTankIdData = res.data
+ })
+
let now = {
inventoryId: this.inventoryId,
goodsId: mul.id,
@@ -506,10 +517,15 @@ export default {
damageQuantity:0,
profitLossAmount:0, // 盈亏金额
inventoryDiscrepancy:0, // 库存差异
+ purchase:getPurchaseByTankIdData.purchase,
+ goodsSales:getPurchaseByTankIdData.goodsSales,
+ inventorySales:getPurchaseByTankIdData.inventorySales,
+ exchangeSales:getPurchaseByTankIdData.exchangeSales,
+
}
this_.detailsList.push(now)
}
- })
+ }
if(sum>0) {
this.$modal.msgError("同一货损单不能有两件相同的商品，您选择了"+sum+"件相同的商品，已为您剔除");
}
diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index 44551dfc0..7a96ccb52 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -127,7 +127,7 @@ export default {
pageSize:null
},
loading: false,
- dateRange: [],
+ dateRange: [new Date(),new Date()],
defaultSort: {prop: 'createTime', order: 'descending'},
total: 0,
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index cf5b92be8..67efc1b47 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -26,7 +26,7 @@
{{item.gunName}}
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
index 8e0bd35e7..08cad0844 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
@@ -178,7 +178,7 @@
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index b05b50842..ba1c3be38 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -645,8 +645,9 @@ export default {
this.getList();
},
// 新增按钮操作
- handleAdd() {
+ async handleAdd() {
this.reset();
+ await this.getAuditPrem()
this.open = true;
this.title = "新增员工";
},
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java
index 88d23831f..48374d5dc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java
@@ -58,6 +58,13 @@ public class MtInventoryDetailsController extends BaseController {
return getSuccessResult(list);
}
+ @GetMapping("/getSalesByMtInventory")
+ public ResponseObject getSales(Integer goodsId) {
+ return getSuccessResult(mtInventoryDetailsService.getSales(goodsId));
+
+ }
+
+
/**
* 通过主键查询单条数据
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryDetailsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryDetailsService.java
index acb21cc65..fe6ac8022 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryDetailsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryDetailsService.java
@@ -37,6 +37,8 @@ public interface MtInventoryDetailsService {
IPage getListByPage(Page page, MtInventoryDetails mtInventoryDetails);
+
+ MtInventoryDetailsVO getSales(Integer goodsId);
/**
* 新增数据
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryDetailsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryDetailsServiceImpl.java
index b1f52d10c..656985679 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryDetailsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryDetailsServiceImpl.java
@@ -95,11 +95,14 @@ public class MtInventoryDetailsServiceImpl implements MtInventoryDetailsService
}
// 查询销售数据
- LJOrder statisticsByTime = ljOrderService.getStatisticsByTime(queryTime, record.getGoodsId());
+ LJOrder statisticsByTime = ljOrderService.getStatisticsByTime(queryTime, record.getGoodsId(),null);
// 查询积分兑换数据
IntegralOrders statisticsByTime1 = integralOrdersService.getStatisticsByTime(queryTime, record.getGoodsId());
// 查询积分商品库存
IntegralGift stockByGoodsId = integralGiftService.getStockByGoodsId(record.getGoodsId());
+ // 兑换卷
+ LJOrder statisticsByTime2 = ljOrderService.getStatisticsByTime(queryTime, record.getGoodsId(),"0");
+
if (ObjectUtil.isNotEmpty(statisticsByTime)) {
@@ -111,10 +114,51 @@ public class MtInventoryDetailsServiceImpl implements MtInventoryDetailsService
if (ObjectUtil.isNotEmpty(stockByGoodsId)) {
record.setStock(record.getStock()+stockByGoodsId.getRemainingInventory());
}
+ if (ObjectUtil.isNotEmpty(stockByGoodsId)) {
+ record.setExchangeSales(statisticsByTime2.getGoodsNum().toString());
+ }
}
return MtInventoryDetailsIPage;
}
+
+ public MtInventoryDetailsVO getSales(Integer goodsId) {
+ MtInventoryDetailsVO record = new MtInventoryDetailsVO();
+ record.setGoodsId(goodsId);
+ Date queryTime = new Date();
+ // 查询进货数据
+ MtPurchaseDetails incomingGoodsData = mtPurchaseDetailsService.getIncomingGoodsData(record.getGoodsId());
+ if (ObjectUtil.isNotEmpty(incomingGoodsData)) {
+ record.setPurchase(incomingGoodsData.getQuantityPurchased().toString());
+ queryTime = incomingGoodsData.getUpdateTime();
+ }
+
+ // 查询销售数据
+ LJOrder statisticsByTime = ljOrderService.getStatisticsByTime(queryTime, record.getGoodsId(),null);
+ // 查询积分兑换数据
+ IntegralOrders statisticsByTime1 = integralOrdersService.getStatisticsByTime(queryTime, record.getGoodsId());
+ // 查询积分商品库存
+ IntegralGift stockByGoodsId = integralGiftService.getStockByGoodsId(record.getGoodsId());
+ // 兑换卷
+ LJOrder statisticsByTime2 = ljOrderService.getStatisticsByTime(queryTime, record.getGoodsId(),"0");
+
+
+
+ if (ObjectUtil.isNotEmpty(statisticsByTime)) {
+ record.setGoodsSales(statisticsByTime.getGoodsNum().toString());
+ }
+ if (ObjectUtil.isNotEmpty(statisticsByTime1)) {
+ record.setInventorySales(statisticsByTime1.getExchangeQuantity().toString());
+ }
+ if (ObjectUtil.isNotEmpty(stockByGoodsId)) {
+ record.setStock(record.getStock()+stockByGoodsId.getRemainingInventory());
+ }
+ if (ObjectUtil.isNotEmpty(stockByGoodsId)) {
+ record.setExchangeSales(statisticsByTime2.getGoodsNum().toString());
+ }
+ return record;
+ }
+
/**
* 新增数据
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryDetailsVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryDetailsVO.java
index 930a83b54..32b259973 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryDetailsVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryDetailsVO.java
@@ -23,5 +23,6 @@ public class MtInventoryDetailsVO extends MtInventoryDetails {
private String goodsSales;
// 积分商品兑换量
private String inventorySales;
-
+ // 兑换卷
+ private String exchangeSales;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
index 368284565..a39900df0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
@@ -36,5 +36,5 @@ public interface LJOrderMapper extends BaseMapper {
Map orderStatistics(@Param("order") LJOrder order);
- LJOrder getStatisticsByTime(@Param("time") Date time,@Param("goodsId") Integer goodsId);
+ LJOrder getStatisticsByTime(@Param("time") Date time,@Param("goodsId") Integer goodsId,@Param("payType") String payType);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index 3e605452b..0fc173c43 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -202,6 +202,9 @@
left join mt_order_goods mog ON mo.id = mog.goods_id
where
mog.goods_id = #{goodsId}
+
+ and mo.pay_type = #{payType}
+
and mo.create_time >= #{time}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index e49aa3591..5c5337be8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -549,6 +549,10 @@
od.order_no = #{orderNo}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
交班
@@ -124,7 +124,7 @@ export default {
pageSize:null
},
loading: false,
- dateRange: [],
+ dateRange: [new Date(),new Date()],
defaultSort: {prop: 'createTime', order: 'descending'},
total: 0,
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
index 7a0de613d..cc76fce74 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
@@ -58,11 +58,11 @@
￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilPaid : '0' }}
-
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index 54992ab2e..bb9b03c29 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -464,7 +464,7 @@ import {
import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/user";
import {getUserGrade} from "@/api/cashier/usergrade";
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
-import {getLodop} from "@/api/LodopFuncs";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
export default {
name: "Integral",
@@ -595,11 +595,6 @@ import {getLodop} from "@/api/LodopFuncs";
// })
// }
- console.log("111",data.markPurchases)
- console.log("222",data.remainingInventory)
- console.log("333",data)
-
-
if (data.markPurchases) {
if (data.markPurchases>=data.remainingInventory){
this.$message.error('库存不足');
@@ -878,6 +873,7 @@ import {getLodop} from "@/api/LodopFuncs";
}
}else if (data.exchangeMethod =='积分+加钱购') {
+
let exchange = new BigNumber(data.exchangePoints);
let mark = new BigNumber(data.markPurchases);
let exchangePoints_sum = exchange.multipliedBy(mark);
@@ -904,6 +900,7 @@ import {getLodop} from "@/api/LodopFuncs";
this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
}
+ console.log("data积分",data)
}
},
// 打开订单记录
@@ -937,6 +934,7 @@ import {getLodop} from "@/api/LodopFuncs";
let integralOrdersList = []
if (this_.shoppingCart.length >0) {
//数组组装
+ console.log("this_.shoppingCart",this_.shoppingCart)
this_.shoppingCart.forEach(res =>{
let integralOrders = {
userId : this_.member.id,
@@ -1040,6 +1038,9 @@ import {getLodop} from "@/api/LodopFuncs";
this.authCode = '';
},
async printLocally(data) {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
From 570f8c9c0f97320bfbdd79c545c7e395229b86bb Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Tue, 27 Feb 2024 15:32:58 +0800
Subject: [PATCH 2/6] no message
---
.../order/mapper/xml/CashierOrderMapper.xml | 42 +++++++
.../views/cashier/NewComponents/Integral.vue | 116 ++++++++++++++----
.../cashier/orderComponents/order_Cashier.vue | 16 ++-
3 files changed, 150 insertions(+), 24 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
index 04a6fee07..80bbf4193 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
@@ -99,6 +99,48 @@
) AS numberOfStrokes, -- 笔数
+ (SELECT count(*) FROM cashier_order
+
+ store_id = #{order.storeId}
+ and oil_order_id is not null
+
+ and staff_id = #{order.staffId}
+
+
+ and order_no like concat('%', #{order.orderNo}, '%')
+
+
+ and terminal like concat('%', #{order.terminal}, '%')
+
+
+ and date_format(pay_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d')
+
+
+ and date_format(pay_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d')
+
+
+ ) AS numberOfStrokesByOil, -- 笔数
+ (SELECT count(*) FROM cashier_order
+
+ store_id = #{order.storeId}
+ and goods_order_id is not null
+
+ and staff_id = #{order.staffId}
+
+
+ and order_no like concat('%', #{order.orderNo}, '%')
+
+
+ and terminal like concat('%', #{order.terminal}, '%')
+
+
+ and date_format(pay_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d')
+
+
+ and date_format(pay_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d')
+
+
+ ) AS numberOfStrokesByGoods, -- 笔数
(SELECT sum(amount) FROM cashier_order
store_id = #{order.storeId}
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index bb9b03c29..741385b49 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -595,7 +595,34 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
// })
// }
- if (data.markPurchases) {
+
+ if (this.shoppingCart.length != 0) {
+ // 只能订购加钱购
+ let flag = false
+ this.shoppingCart.forEach(res => {
+ if (res.exchangeMethod == "积分+加钱购") {
+ flag = true
+ }
+ })
+
+ if (data.exchangeMethod == "积分+加钱购" || flag) {
+ flag = false
+ this.shoppingCart.forEach(res => {
+ if (res.id != data.id ) {
+ flag = true
+
+ return
+ }
+ })
+ }
+ if (flag){
+ this.$message.error('“加钱购”商品仅支持在单商品结算时支持积分不足情况下使用加钱购进行付款,多个商品结算不支持“加钱够”计算');
+ return
+ }
+ }
+
+
+ if (data.markPurchases) {
if (data.markPurchases>=data.remainingInventory){
this.$message.error('库存不足');
return
@@ -617,6 +644,9 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
// 计算总额
this.dataChange(data);
+
+
+
if (this.shoppingCart.length === 0) {
this.shoppingCart.push(data);
} else {
@@ -739,6 +769,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
});
} else {
this.openShoppingCart = true
+ this.dataChange(this.shoppingCart[0])
}
},
// 购物车页面计算
@@ -790,7 +821,9 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
// 拿到总的积分
this.member.points = this.member.points?this.member.points:0
let points = this.member.points - exchangePoints.toNumber(); // 使用 toNumber() 获取 BigNumber 的数值
-
+ if (this.member.points<0) {
+ points = 0
+ }
// 以及分等一多少
if (points < 0) {
@@ -874,33 +907,74 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
}else if (data.exchangeMethod =='积分+加钱购') {
- let exchange = new BigNumber(data.exchangePoints);
- let mark = new BigNumber(data.markPurchases);
- let exchangePoints_sum = exchange.multipliedBy(mark);
- this.$set(data, "exchangePoints_sum", exchangePoints_sum);
- if (data.exchangePoints_sum) {
- data.exchangePoints_sum = Number(exchangePoints_sum);
- }else {
- this.$set(data, "exchangePoints_sum", exchangePoints_sum);
+ let exchangePoints_sum = 0
+ let exchangeAmount_sum = 0
+
+ // let data1 = this.shoppingCart[0];
+ // 计算加钱购商品一共多少积分
+ let markPurchases = new BigNumber(data.markPurchases);
+ let exchangePoints = markPurchases.multipliedBy(new BigNumber(data.exchangePoints));
+ // 拿到总的积分
+ this.member.points = this.member.points?this.member.points:0
+ let points = this.member.points - exchangePoints.toNumber(); // 使用 toNumber() 获取 BigNumber 的数值
+ console.log("points",points)
+ // 以及分等一多少
+ if (points < 0) {
+
+ // 计算需要的金额
+ points = Math.abs(points);
+
+
+ exchangeAmount_sum = points * data.moneyRatio; // 直接使用 JavaScript 中的乘法
+ exchangeAmount_sum = exchangeAmount_sum.toFixed(2);
+
+ exchangePoints_sum = this.member.points;
+ } else {
+ exchangeAmount_sum = 0
+ exchangePoints_sum = exchangePoints.toNumber();
}
+ this.$set(data, "exchangePoints_sum", exchangePoints_sum)
+ this.$set(data, "exchangeAmount_sum", exchangeAmount_sum)
- let ratio = new BigNumber(data.moneyRatio);
- let moneyRatio_sum = ratio.multipliedBy(mark);
- this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
- if (data.moneyRatio_sum) {
- data.moneyRatio_sum = moneyRatio_sum;
- }else {
- this.$set(data, "moneyRatio_sum", moneyRatio_sum);
- }
if (data.totalPoints_sum) {
- data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"";
+ data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+exchangeAmount_sum+"";
}else {
- this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
+ this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+exchangeAmount_sum+"");
}
- console.log("data积分",data)
+ console.log("数据",data)
+ return
+
+ //
+ // let exchange = new BigNumber(data.exchangePoints);
+ // let mark = new BigNumber(data.markPurchases);
+ // let exchangePoints_sum = exchange.multipliedBy(mark);
+ // this.$set(data, "exchangePoints_sum", exchangePoints_sum);
+ //
+ // if (data.exchangePoints_sum) {
+ // data.exchangePoints_sum = Number(exchangePoints_sum);
+ // }else {
+ // this.$set(data, "exchangePoints_sum", exchangePoints_sum);
+ // }
+ //
+ // let ratio = new BigNumber(data.moneyRatio);
+ // let moneyRatio_sum = ratio.multipliedBy(mark);
+ // this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
+ //
+ // if (data.moneyRatio_sum) {
+ // data.moneyRatio_sum = moneyRatio_sum;
+ // }else {
+ // this.$set(data, "moneyRatio_sum", moneyRatio_sum);
+ // }
+ // if (data.totalPoints_sum) {
+ // data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"";
+ // }else {
+ // this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
+ //
+ // }
+ // console.log("data积分",data)
}
},
// 打开订单记录
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 394e72af9..cc1448221 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -54,9 +54,19 @@
收银台订单统计
-
-
笔数
-
{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}
+
+
+
笔数
+
{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}
+
+
+
油品笔数
+
{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}
+
+
+
商品笔数
+
{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}
+
订单总金额
From 101ef539c36003b29abeb6f7244b9bc85b0d9b45 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 27 Feb 2024 17:59:16 +0800
Subject: [PATCH 3/6] bug
---
.../com/fuint/api/fuyou/entity/Const.java | 4 +-
.../service/impl/LJStaffServiceImpl.java | 12 +++
.../business/order/entity/OrderGoods.java | 17 ++++
.../order/mapper/xml/OrderGoodsMapper.xml | 3 +-
.../service/impl/LJOrderServiceImpl.java | 10 +++
.../service/impl/OilOrderServiceImpl.java | 1 +
.../service/impl/OrderGoodsServiceImpl.java | 9 ++
.../fuint/business/order/vo/OrderGoodsVo.java | 6 +-
.../views/cashier/NewComponents/homeindex.vue | 89 +++++++++++++------
.../cashier/orderComponents/order_Cashier.vue | 59 ++++++------
.../cashier/vipComponents/balanceList.vue | 82 +++++++++++++----
gasStation-uni/pages/index/index.vue | 8 +-
12 files changed, 217 insertions(+), 83 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
index fc1531ef8..c69471fc9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
@@ -49,8 +49,8 @@ public class Const {
public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
//异步通知(回调地址)
-// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
- public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
+ public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
//下单
public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate";
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 66788ef4f..f7f8b62a9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -269,6 +269,18 @@ public class LJStaffServiceImpl extends ServiceImpl
impl
e.printStackTrace();
}
}
+ }else {
+ TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
+ if (ObjectUtil.isNotEmpty(tAccount)) {
+ if (tAccount.getAccountName().matches("\\d+")) {
+ tAccount.setAccountName(staff.getMobile());
+ }
+ try {
+ accountService.editAccount(tAccount, null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
return row;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OrderGoods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OrderGoods.java
index c47611296..00e63a005 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OrderGoods.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OrderGoods.java
@@ -38,6 +38,23 @@ public class OrderGoods extends BaseEntity implements Serializable {
* 商品数量
*/
private Integer num;
+ /**
+ * 商品单价
+ */
+ private Double retailPrice;
+ /**
+ * 商品会员价
+ */
+ private Double memberPrice;
+ /**
+ * 商品合计金额
+ */
+ private Double allAmount;
+ /**
+ * 商品实付金额
+ */
+ private Double payAmount;
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
index 395da0293..1199a20e9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml
@@ -2,7 +2,8 @@
- select mog.id,mog.order_id,mog.goods_id as goods_id,mg.id as goodsId,mg.name,mg.retail_price,mg.member_price,mog.num,mg.unit
+ select mog.id,mog.order_id,mog.goods_id as goods_id,mg.id as goodsId,mg.name,mog.retail_price,
+ mog.member_price,mog.num,mg.unit,mog.all_amount,mog.pay_amount
from mt_order_goods mog inner join mt_goods mg on mog.goods_id = mg.id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index 6ede16b6d..8a29a3732 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.convenienceSore.entity.LJGoods;
+import com.fuint.business.convenienceSore.service.LJGoodsService;
import com.fuint.business.order.entity.LJOrder;
import com.fuint.business.order.entity.OrderGoods;
import com.fuint.business.order.mapper.LJOrderMapper;
@@ -122,6 +124,9 @@ public class LJOrderServiceImpl extends ServiceImpl impl
return baseMapper.getStatisticsByTime(time, goodsId, payType);
}
+ @Autowired
+ private LJGoodsService goodsService;
+
@Override
public void addGoodOrder(LJOrder order,Integer goodsId) {
if (ObjectUtil.isEmpty(order.getOrderNo())){
@@ -134,10 +139,15 @@ public class LJOrderServiceImpl extends ServiceImpl impl
}
baseMapper.insert(order);
LJOrder ljOrder = this.selectGoodsOrder(order.getOrderNo());
+ LJGoods ljGoods = goodsService.selectLJGoodsById(goodsId);
OrderGoods orderGoods = new OrderGoods();
orderGoods.setGoodsId(goodsId);
orderGoods.setOrderId(ljOrder.getId());
orderGoods.setNum(ljOrder.getGoodsNum());
+ orderGoods.setRetailPrice(ljGoods.getRetailPrice());
+ orderGoods.setMemberPrice(ljGoods.getMemberPrice());
+ orderGoods.setAllAmount(order.getAmount());
+ orderGoods.setPayAmount(order.getPayAmount());
orderGoodsService.save(orderGoods);
}
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index a06a6aa5a..2afe2deb1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -521,6 +521,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
// throw new RuntimeException("支付失败");
}
}else {
+ cashierOrder.setPayAmount(oilAmount+goodsAmount-oilDiscount-goodsDiscount);
this.insertAllOrderInfo(orderNo,storeId,oilAmount+goodsAmount,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid");
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
index 79562e954..65c6caa0d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
@@ -40,6 +40,15 @@ public class OrderGoodsServiceImpl extends ServiceImpl0){
this.checkAll4 = true
- this.payType = "balance"
+ if (this.goodsOrder.length==0) {
+ this.payType = "balance"
+ }
}
}else {
this.checkAll4 = false
@@ -2720,7 +2721,9 @@
this.checkAll3 = false
this.isOilStorageCard = false;
this.consumeRefuelMoney = 0;
- this.payType = "balance"
+ if (this.goodsOrder.length==0) {
+ this.payType = "balance"
+ }
this.countAmountFull();
this.isUseBalance = false;
}
@@ -2742,7 +2745,9 @@
this.couponAmount = 0
if (this.balance>0){
this.checkAll4 = true
- this.payType = "balance"
+ if (this.goodsOrder.length==0) {
+ this.payType = "balance"
+ }
}
}
this.countAmountFull();
@@ -2920,13 +2925,11 @@
// if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
// _this.oilDiscount = 0
// _this.checkAll4 = false
- // console.log(111)
// }else {
_this.oilDiscount += discount.discount
_this.gradeDiscount.push(discount)
_this.checkAll2 = true
_this.checkedCities2.push(discount.gunName)
- // console.log(222)
// }
}
}
@@ -3085,7 +3088,9 @@
// }
if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
this.checkAll4 = true
- this.payType = "balance"
+ if (this.goodsOrder.length==0){
+ this.payType = "balance"
+ }
this.countAmountFull()
}
await this.getGrade(this.member.id,this.member.gradeId)
@@ -3172,7 +3177,6 @@
}
}
// }
- // console.log(_this.couponAmount,222)
if(!this.isOilStorageCard){
this.countAmountFull()
}
@@ -3182,7 +3186,6 @@
if (type==0){
this.countAmountFull()
}
- // console.log(discount,_this.gradeDiscount,_this.couponDiscount,_this.fullReduceDiscount,"1264")
})
})
},
@@ -3258,7 +3261,9 @@
// 满减互斥
_this.checkAll1 = false
_this.checkAll4 = true;
- this.payType = "balance"
+ if (_this.goodsOrder.length==0) {
+ _this.payType = "balance"
+ }
_this.fullReduction = 0
_this.isUseFull = true;
}else {
@@ -3448,7 +3453,6 @@
},
// 选择员工信息
chooseStaff(data){
- console.log(data,"qusnv")
this.staff = data;
this.map.staffId = this.staff.id;
this.dialogVisible = false
@@ -3460,6 +3464,7 @@
},
// 添加商品列表信息
changeGoods(val){
+ this.payType = "WECHAT"
let result = true;
let goods = this.goodsOrder;
let _this = this;
@@ -3473,19 +3478,20 @@
break;
}
goods[i].num = goods[i].num + 1;
+ val.num = goods[i].num + 1;
this.goodsTotal += 1;
+ if (_this.isMember) {
+ this.goodsDiscount += +((goods[i].retailPrice-goods[i].memberPrice)*goods[i].num).toFixed(2)
+ }
+ amount += goods[i].retailPrice * goods[i].num
result = false;
break;
} else {
result = true;
}
- if (_this.isMember) {
- this.goodsDiscount += +((goods[i].retailPrice-goods[i].memberPrice)*goods[i].num).toFixed(2)
- }
- amount += +(goods[i].retailPrice * goods[i].num).toFixed(2)
}
- this.goodsAmount = amount;
- this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
+ // this.goodsAmount = amount;
+ // this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
} else {
result = true;
}
@@ -3498,6 +3504,7 @@
if (_this.isMember) {
this.goodsDiscount += (val.retailPrice - val.memberPrice)
}
+ console.log(this.goodsAmount)
this.goodsAmount += +val.retailPrice
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.goodsOrder.push(val);
@@ -3507,14 +3514,26 @@
this.$modal.msgError("商品库存不足，请重新选择商品")
return;
}
- if (_this.isMember) {
- this.goodsDiscount += (val.retailPrice - val.memberPrice) * val.num
+ // if (_this.isMember) {
+ // this.goodsDiscount += (val.retailPrice - val.memberPrice) * val.num
+ // }
+ // this.goodsAmount += val.retailPrice * val.num
+ // this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
+ _this.goodsDiscount = 0
+ _this.goodsAmount = 0
+ if (this.goodsOrder.length > 0) {
+ goods.forEach(item => {
+ // if (item.id != val.id){
+ if (_this.isMember) {
+ _this.goodsDiscount += (item.retailPrice - item.memberPrice) * item.num
+ }
+ _this.goodsAmount += item.retailPrice * item.num
+ _this.goodsActualPay = _this.goodsAmount - _this.goodsDiscount;
+ // }
+ })
}
- this.goodsAmount += +val.retailPrice * val.num
- this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
}
this.goods = ""
-
},
// 立即结算
settlement(){
@@ -3555,6 +3574,7 @@
this.gradeDiscount = [];
this.couponDiscount = [];
this.checkAll4 = false;
+ this.isExistOilOrder = false
if (this.member.refuelMoney!=null){
this.refuelMoney = JSON.parse(this.member.refuelMoney)
@@ -3621,7 +3641,9 @@
}
if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
this.checkAll4 = true
- this.payType = "balance"
+ if (this.goodsOrder.length==0) {
+ this.payType = "balance"
+ }
this.countAmountFull()
}
await this.getGrade(this.member.id,this.member.gradeId)
@@ -3845,6 +3867,7 @@
this.map.staffId = this.staff.id
this.map.cardFavorableId = this.cardFavorableId
this.map.recordId = this.recordId
+ this.map.userId = this.member.id
let _this = this;
if (this.payType=="APPLET_CODE"){
@@ -3877,7 +3900,6 @@
let isPaySuccess = false;
await addLJGoods(_this.map).then( response => {
- console.log('3867386738673867')
_this.orderNo = response.data.orderNo;
if (response.data.oilOrder!=null){
if (response.data.oilOrder.orderStatus == "paid"){
@@ -4147,11 +4169,15 @@
payMethod(payType){
if (payType == 'oilCard'){
if (this.isMember){
+ if (this.goodsOrder.length>0){
+ this.$message.error("商品不可使用囤油卡付款")
+ return;
+ }
if (this.refuelMoney1.length>0){
this.checkAll3 = true
this.handleCheckAllChange3(true)
}else {
- this.$message.error("请先充值囤油卡")
+ this.$message.error("请先充值！！")
return;
}
}else {
@@ -4161,8 +4187,17 @@
}
if (payType == 'balance'){
if (this.isMember){
- this.checkAll4 = true
- this.handleCheckAllChange4(true)
+ if (this.goodsOrder.length>0){
+ this.$message.error("商品不可使用储值卡付款")
+ return;
+ }
+ if (this.balance>0){
+ this.checkAll4 = true
+ this.handleCheckAllChange4(true)
+ }else {
+ this.$message.error("请先充值！！")
+ return;
+ }
}else {
this.$message.error("请先选择会员")
return;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index cc1448221..3d0fb9ce2 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -256,32 +256,32 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ :data="oilInfo"
+ style="width: 100%">
+
+
+ {{ getName(oilNameList,scope.row.oils) }}/{{ getName1(oilGunList,scope.row.oilGunNum) }}
+
+
+
+
+ {{ scope.row.orderAmount }}
+
+
+
+
+ {{ scope.row.oilNum }}L
+
+
+
+
+ {{ scope.row.oilPrice }}/L
+
+
@@ -294,8 +294,8 @@
-
-
+
+
- {{ (scope.row.retailPrice * scope.row.num).toFixed(2) }}
+ {{ scope.row.allAmount }}
- {{ (scope.row.retailPrice * scope.row.num).toFixed(2) }}
- {{ (scope.row.memberPrice * scope.row.num).toFixed(2) }}
+ {{ scope.row.payAmount }}
diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue
index 25494d9ba..254aea939 100644
--- a/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue
+++ b/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue
@@ -20,16 +20,29 @@
+
+
+
+
+
+
+
+
+
+
+ v-model="beginTime"
+ style="width: 160px"
+ type="date"
+ placeholder="开始日期">
+
+ 至
+
+
搜索
@@ -142,16 +155,29 @@
+
+
+
+
+
+
+
+
+
+
+ v-model="beginTime"
+ style="width: 160px"
+ type="date"
+ placeholder="开始日期">
+
+ 至
+
+
搜索
@@ -164,7 +190,7 @@
- 升数卡统计
+ 囤油卡统计
@@ -507,6 +533,8 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
totalConsumption1:0,
totalRecharge1:0,
dateRange:[],
+ beginTime:"",
+ endTime:"",
// 用户列表
userList:[],
@@ -623,6 +651,10 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
+ if (this.beginTime && this.endTime) {
+ this.dateRange.push(this.beginTime.toLocaleDateString())
+ this.dateRange.push(this.endTime.toLocaleDateString())
+ }
listCardBalanceRecord(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.cardBalanceList = res.data.records
this.total = res.data.total
@@ -633,6 +665,10 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
+ if (this.beginTime && this.endTime) {
+ this.dateRange.push(this.beginTime.toLocaleDateString())
+ this.dateRange.push(this.endTime.toLocaleDateString())
+ }
cardBalanceCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.inCount = res.data.inCount
this.outCount = res.data.outCount
@@ -645,6 +681,10 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
+ if (this.beginTime && this.endTime) {
+ this.dateRange.push(this.beginTime.toLocaleDateString())
+ this.dateRange.push(this.endTime.toLocaleDateString())
+ }
listCardOilRecord(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.cardOilList = res.data.records
this.total1 = res.data.total
@@ -655,6 +695,10 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
+ if (this.beginTime && this.endTime) {
+ this.dateRange.push(this.beginTime.toLocaleDateString())
+ this.dateRange.push(this.endTime.toLocaleDateString())
+ }
cardOilCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.inCount1 = res.data.inCount
this.outCount1 = res.data.outCount
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index d1d89f71f..a79dfbee2 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -86,9 +86,9 @@
{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-
+
@@ -490,6 +490,10 @@
},
// 获取当前位置
getAddress(storeId) {
+ uni.showToast({
+ title:"店铺id"+storeId,
+ icon:"none"
+ })
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
From 5fe8443e1ba1253c40ecd1bdd27399fda3583798 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 27 Feb 2024 18:08:55 +0800
Subject: [PATCH 4/6] bug
---
gasStation-uni/pages/index/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index a79dfbee2..3fdb049c8 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -490,10 +490,10 @@
},
// 获取当前位置
getAddress(storeId) {
- uni.showToast({
- title:"店铺id"+storeId,
- icon:"none"
- })
+ // uni.showToast({
+ // title:"店铺id"+storeId,
+ // icon:"none"
+ // })
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
From d570586be5ecdb51e36ccdc111f9f6bfe80a2fcb Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Wed, 28 Feb 2024 13:24:53 +0800
Subject: [PATCH 5/6] no message
---
fuintAdmin/src/views/integral/gift/index.vue | 4 +-
.../controller/IntegralOrdersController.java | 4 +-
.../integral/mapper/IntegralOrdersMapper.java | 2 +-
.../mapper/xml/IntegralGiftMapper.xml | 4 +-
.../mapper/xml/IntegralOrdersMapper.xml | 72 ++++++++++++++---
.../service/IntegralOrdersService.java | 2 +-
.../impl/IntegralOrdersServiceImpl.java | 7 +-
.../controller/HandoverRecordController.java | 6 +-
.../order/mapper/HandoverRecordMapper.java | 20 ++---
.../order/mapper/xml/HandoverRecordMapper.xml | 42 ++++++++--
.../order/service/HandoverRecordService.java | 4 +-
.../service/impl/AllOrderInfoServiceImpl.java | 5 +-
.../impl/HandoverRecordServiceImpl.java | 78 ++++++++++--------
fuintCashierWeb/src/api/cashier/handover.js | 4 +-
.../views/cashier/NewComponents/Handover.vue | 79 ++++++++++++++-----
.../cashier/NewComponents/HandoverDetails.vue | 39 ++++++---
.../views/cashier/NewComponents/Integral.vue | 61 +++++++++++---
.../integralOrder/pointsCashier.vue | 6 +-
18 files changed, 317 insertions(+), 122 deletions(-)
diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue
index d12b96f68..fe4e646ac 100644
--- a/fuintAdmin/src/views/integral/gift/index.vue
+++ b/fuintAdmin/src/views/integral/gift/index.vue
@@ -666,7 +666,7 @@ export default {
// 批量图片
giftImages: [],
// 上传地址
- uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
+ uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
uploadHeader: { 'Access-Token' : getToken() },
// 隐藏上传
hideUpload: false,
@@ -676,7 +676,7 @@ export default {
url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
],
// 图片根目录
- imagePath: process.env.VUE_APP_SERVER_URL,
+ imagePath: process.env.VUE_APP_BASE_API,
dialogImageUrl: "",
dialogVisible: false,
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
index bb61ec102..03ea1b47e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -123,8 +123,8 @@ public class IntegralOrdersController extends BaseController {
* @return
*/
@GetMapping("/statistics")
- public ResponseObject statistics(Integer orderType) {
- return getSuccessResult(this.integralOrdersService.statistics(orderType));
+ public ResponseObject statistics(IntegralOrdersDTO integralOrders) {
+ return getSuccessResult(this.integralOrdersService.statistics(integralOrders));
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
index 0568b49ce..63b698ca5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
@@ -97,7 +97,7 @@ public interface IntegralOrdersMapper {
* 统计数据
* @return
*/
- Map statistics(@Param("storeId") Integer storeId, @Param("orderType") Integer orderType);
+ Map statistics(@Param("integralOrders") IntegralOrdersDTO integralOrders);
List getListByOrderNo(@Param("orderNumber") String orderNumber,@Param("storeId") Integer storeId);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
index 72c2730e7..3de91c393 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
@@ -103,7 +103,9 @@
and ig.gift_name like CONCAT ('%',#{integralGift.giftName},'%')
- and ig.delivery_method like CONCAT ('%',#{integralGift.deliveryMethod},'%')
+ and (ig.delivery_method like CONCAT ('%',#{integralGift.deliveryMethod},'%')
+ or ig.delivery_method = '[]'
+ )
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 0826cbe04..6f000fcde 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -295,16 +295,68 @@
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
index c50086651..88334ab34 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
@@ -66,7 +66,7 @@ public interface IntegralOrdersService {
* @return 是否成功
*/
boolean deleteById(Integer id);
- Map statistics(Integer orderType);
+ Map statistics(IntegralOrdersDTO integralOrders);
IntegralOrders integralOrdersProcessing(IntegralOrdersRequest integralOrdersList);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index 85ecd8d67..7a8316e54 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -156,9 +156,10 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
}
@Override
- public Map statistics(Integer orderType) {
+ public Map statistics(IntegralOrdersDTO integralOrders) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- return this.integralOrdersDao.statistics(nowAccountInfo.getStoreId(),orderType);
+ integralOrders.setStoreId(nowAccountInfo.getStoreId());
+ return this.integralOrdersDao.statistics(integralOrders);
}
@Resource
@@ -326,7 +327,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
for (IntegralOrders integralOrders : listByOrderNo) {
// 查询员工信息
LJStaff ljStaff = ljStaffMapper.selectById(integralOrders.getStaffId());
-
+ if (ObjectUtil.isEmpty(integralOrders.getIntegral())) integralOrders.setIntegral(0.0);
totalPoints = totalPoints.add(new BigDecimal(integralOrders.getIntegral()));
// 加兑换卷和优惠券判断
IntegralGift integralGift = integralGiftService.queryById(integralOrders.getGiftId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java
index 93d888102..ba67e48b4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java
@@ -54,7 +54,7 @@ public class HandoverRecordController extends BaseController {
@GetMapping("selectByTime")
public ResponseObject selectByTime() {
- return getSuccessResult(this.handoverRecordService.selectByTime());
+ return getSuccessResult(this.handoverRecordService.selectByTime(null));
}
/**
@@ -107,8 +107,8 @@ public class HandoverRecordController extends BaseController {
* @return
*/
@GetMapping("handover")
- public ResponseObject handover() {
- return getSuccessResult(handoverRecordService.handover());
+ public ResponseObject handover(Integer staffId) {
+ return getSuccessResult(handoverRecordService.handover(staffId));
}
@GetMapping("handoverByAllOrder")
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HandoverRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HandoverRecordMapper.java
index 77fb844a5..239acf2ad 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HandoverRecordMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HandoverRecordMapper.java
@@ -85,25 +85,25 @@ public interface HandoverRecordMapper {
int deleteById(Integer id);
// 油品交易信息
- Map oilOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ Map oilOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
// 会员储值交易信息
- Map cardOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ Map cardOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
// 油卡交易信息
- Map fuelOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ Map fuelOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
// 普通交易
- Map goodsOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ Map goodsOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
- List> paymentAggregation(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> paymentAggregation(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
- List> oilNumberStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> oilNumberStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
- List> greaseGunStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> greaseGunStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
- List> employeeStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> employeeStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId, @Param("staffId") Integer staffId);
- List> billingDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> billingDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId,@Param("staffId") Integer staffId);
- List> returnedToTheAccount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
+ List> returnedToTheAccount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId,@Param("staffId") Integer staffId);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HandoverRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HandoverRecordMapper.xml
index f2ad27be4..8f8323c14 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HandoverRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HandoverRecordMapper.xml
@@ -37,6 +37,9 @@
hr.store_id = #{handoverRecord.storeId}
and hr.status = #{handoverRecord.status}
+
+
+ and hr.staff_id = #{handoverRecord.staffId}
and hr.type = #{handoverRecord.type}
@@ -208,7 +211,7 @@ limit 1
@@ -323,6 +350,9 @@ limit 1
where on1.store_id = #{storeId}
and oo.store_id = 60
and oo.create_time BETWEEN #{startTime} AND #{endTime}
+
+ and staff_id = #{staffId}
+
GROUP BY oo.oils
@@ -338,7 +368,9 @@ limit 1
left join oil_gun og on oo.oil_gun_num = og.id
where oo.store_id = #{storeId}
and oo.create_time BETWEEN #{startTime} AND #{endTime}
-
+
+ and staff_id = #{staffId}
+
GROUP BY oo.oil_gun_num
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 fdbe766ea..86b2c736b 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
@@ -33,7 +33,7 @@ public interface HandoverRecordService {
*/
IPage queryByPage(@Param("page") Page page, @Param("handoverRecord") HandoverRecord handoverRecord);
- HandoverRecord selectByTime();
+ HandoverRecord selectByTime(Integer staffId);
/**
* 新增数据
@@ -59,7 +59,7 @@ public interface HandoverRecordService {
*/
boolean deleteById(Integer id);
- public Map handover();
+ public Map handover(Integer staffId);
public Map handoverByAllOrder();
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 3bf493cb7..91e340cbf 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
@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.Date;
import java.util.HashMap;
@@ -178,7 +179,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl 0) {
+ if (!"CASH".equals(allOrderInfo.getPayType()) && Double.valueOf(map.get("refundAmt")) > 0) {
try {
refund = fyPayService.refund(map);
} catch (Exception e) {
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 42a4c86e7..b04ffa4c0 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,6 +3,7 @@ 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.baomidou.mybatisplus.generator.config.IFileCreate;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.order.entity.HandoverRecord;
@@ -19,6 +20,7 @@ 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 io.swagger.models.auth.In;
import javafx.print.Printer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -83,10 +85,11 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
}
@Override
- public HandoverRecord selectByTime() {
+ public HandoverRecord selectByTime(Integer staffId) {
HandoverRecord handoverRecord = new HandoverRecord();
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
handoverRecord.setStoreId(nowAccountInfo.getStoreId());
+ handoverRecord.setStaffId(staffId);
return handoverRecordMapper.selectByTime(handoverRecord);
}
@@ -100,7 +103,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
public HandoverRecord insert(HandoverRecord handoverRecord) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
handoverRecord.setStoreId(nowAccountInfo.getStoreId());
- handoverRecord.setStaffId(nowAccountInfo.getStaffId());
+ if (ObjectUtil.isEmpty(handoverRecord.getStaffId())) handoverRecord.setStaffId(nowAccountInfo.getStaffId());
this.handoverRecordMapper.insert(handoverRecord);
return handoverRecord;
@@ -130,7 +133,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
}
@Override
- public Map handover() {
+ public Map handover(Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
MtStore mtStore = new MtStore();
@@ -148,15 +151,20 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
Map handoverMap = new HashMap<>();
String startTime = "2023-01-01 12:12:12";
- HandoverRecord handoverRecord = selectByTime();
+
+ HandoverRecord handoverRecord = selectByTime(staffId);
if (!ObjectUtil.isEmpty(handoverRecord) && !ObjectUtil.isEmpty(handoverRecord.getEndTime())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
startTime = sdf.format(handoverRecord.getEndTime());
}
-
- LJStaff ljStaff = iljStaffService.selectStaffById(nowAccountInfo.getStaffId());
+ String handoverType = "统一交班";
+ Integer staff = nowAccountInfo.getStaffId();
+ if (ObjectUtil.isNotEmpty(staffId)){
+ staff = staffId;
+ handoverType = "个人交班";
+ }
+ LJStaff ljStaff = iljStaffService.selectStaffById(staff);
// String handover = iSysDictDataService.selectDictLabel("handover", ljStaff.getHandoverMode());
- String handoverType = "暂无";
// if (!ObjectUtil.isEmpty(handover)) {
// handoverType = handover;
@@ -164,7 +172,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
// 填充 baseInfo
Map baseInfo = new HashMap<>();
baseInfo.put("storeName", mtStore.getName());
- baseInfo.put("realName", nowAccountInfo.getRealName());
+ baseInfo.put("realName", ljStaff.getRealName());
baseInfo.put("handoverType", handoverType);
baseInfo.put("startTime", startTime);
baseInfo.put("endTime", formattedEndTime);
@@ -172,41 +180,41 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
// baseInfo.put("handoverOut", ljStaff.getHandoverOut()); // 交班是否退出
handoverMap.put("baseInfo",baseInfo);
// 获取订单汇总
- Map orderSummaryMap = orderSummary(startTime, formattedEndTime);
+ Map orderSummaryMap = orderSummary(startTime, formattedEndTime, staffId);
handoverMap.put("orderSummary",orderSummaryMap);
// 支付方式汇总
- List> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime);
+ List> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime, staffId);
handoverMap.put("paymentAggregation",paymentAggregationMap);
// 油号统计
- List> oilNumberStatisticsMap = oilNumberStatistics(startTime, formattedEndTime);
+ List> oilNumberStatisticsMap = oilNumberStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("oilNumberStatistics",oilNumberStatisticsMap);
// 油枪统计
- List> greaseGunStatisticsMap = greaseGunStatistics(startTime, formattedEndTime);
+ List> greaseGunStatisticsMap = greaseGunStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("greaseGunStatistics",greaseGunStatisticsMap);
// 员工统计
- List> employeeStatisticsMap = employeeStatistics(startTime, formattedEndTime);
+ List> employeeStatisticsMap = employeeStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("employeeStatistics",employeeStatisticsMap);
// 挂账详情
- List> billingDetailsMap = billingDetails(startTime, formattedEndTime);
+ List> billingDetailsMap = billingDetails(startTime, formattedEndTime, staffId);
handoverMap.put("billingDetails",billingDetailsMap);
// 挂账归还
- List> returnedToTheAccountMap = returnedToTheAccount(startTime, formattedEndTime);
+ List> returnedToTheAccountMap = returnedToTheAccount(startTime, formattedEndTime, staffId) ;
handoverMap.put("returnedToTheAccount",returnedToTheAccountMap);
// 合计
return handoverMap;
}
- public Map orderSummary(String startTime, String endTime) {
+ public Map orderSummary(String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Map allStatistics = new HashMap<>();
// 油品订单(订单) 油品订单(退款) 油品订单(实收) 油品优惠(实收) 油品交易(实收)
- Map oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ Map oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
// 会员储值(订单) 会员储值(退款) 会员储值(实收) 储值赠送(订单) 储值赠送(退款) 储值赠送(实际)
- Map cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
- Map fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ Map cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
+ Map fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
// 普通收款(订单) 普通收款(退款) 普通收款(实收)
- Map goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ Map goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
if (!ObjectUtil.isEmpty(oilOrderStatistics)) {
allStatistics.putAll(oilOrderStatistics);
}else{
@@ -249,9 +257,9 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
* 汇总统计
*/
- public List> paymentAggregation(String startTime, String endTime) {
+ public List> paymentAggregation(String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
+ List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId(),staffId);
List> allRefundMapList = new ArrayList<>();
if (!ObjectUtil.isEmpty(paymentAggregation)) {
for (Map stringStringMap : paymentAggregation) {
@@ -298,9 +306,9 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
return mapList;
}
- public Map paymentAggregation2(String startTime, String endTime) {
+ public Map paymentAggregation2(String startTime, String endTime,Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
+ List> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId() , staffId);
// 共有四个 转为普通map
Map allAggreMap = new HashMap<>();
Map allRefundMap = new HashMap<>();
@@ -358,40 +366,40 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
/**
* 油号统计
*/
- public List> oilNumberStatistics (String startTime, String endTime) {
+ public List> oilNumberStatistics (String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> oilNumberStatistics = handoverRecordMapper.oilNumberStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ List> oilNumberStatistics = handoverRecordMapper.oilNumberStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
return oilNumberStatistics;
}
/**
* 油枪统计
*/
- public List> greaseGunStatistics (String startTime, String endTime) {
+ public List> greaseGunStatistics (String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> greaseGunStatistics = handoverRecordMapper.greaseGunStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ List> greaseGunStatistics = handoverRecordMapper.greaseGunStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
return greaseGunStatistics;
}
/**
* 员工统计
*/
- public List> employeeStatistics (String startTime, String endTime) {
+ public List> employeeStatistics (String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> employeeStatistics = handoverRecordMapper.employeeStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+ List> employeeStatistics = handoverRecordMapper.employeeStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
return employeeStatistics;
}
// 挂账详情
- public List> billingDetails (String startTime, String endTime) {
+ public List> billingDetails (String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> billingDetails = handoverRecordMapper.billingDetails(startTime, endTime, nowAccountInfo.getStoreId());
+ List> billingDetails = handoverRecordMapper.billingDetails(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
return billingDetails;
}
// 挂账归还
- public List> returnedToTheAccount (String startTime, String endTime) {
+ public List> returnedToTheAccount (String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- List> returnedToTheAccount = handoverRecordMapper.returnedToTheAccount(startTime, endTime, nowAccountInfo.getStoreId());
+ List> returnedToTheAccount = handoverRecordMapper.returnedToTheAccount(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
return returnedToTheAccount;
}
@@ -431,7 +439,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
Map handoverMap = new HashMap<>();
String startTime = "2023-01-01 12:12:12";
- HandoverRecord handoverRecord = selectByTime();
+ HandoverRecord handoverRecord = selectByTime(null);
if (!ObjectUtil.isEmpty(handoverRecord) && !ObjectUtil.isEmpty(handoverRecord.getEndTime())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
startTime = sdf.format(handoverRecord.getEndTime());
diff --git a/fuintCashierWeb/src/api/cashier/handover.js b/fuintCashierWeb/src/api/cashier/handover.js
index 85ebb04e2..d0b4e2bbd 100644
--- a/fuintCashierWeb/src/api/cashier/handover.js
+++ b/fuintCashierWeb/src/api/cashier/handover.js
@@ -1,10 +1,10 @@
import request from '@/utils/request'
-export function getHandoverApi() {
+export function getHandoverApi(query) {
return request({
url: '/business/handoverRecord/handover',
method: 'get',
- // params: query
+ params: query
})
}
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 787bcf2b8..e05b2b649 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -79,11 +79,11 @@
￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardOrder : '0' }}
@@ -392,23 +404,52 @@ import BigNumber from "bignumber.js";
import {removeUserId} from "@/utils/auth";
import { getLodop } from "@/api/LodopFuncs";
import Vue from 'vue';
+import SelectStaff from "@/components/local/selectStaff.vue";
export default {
name: "Handover",
+ components: {SelectStaff},
data() {
return {
handoverList : {},
-
+ openStaff: false,
+ staff:{
+ staffId:'',
+ staffName:null
+ }
}
},
created() {
this.getHandover();
},
methods: {
+ clean() {
+ this.staff={
+ staffId:'',
+ staffName:null
+ }
+ },
+ // 选择员工
+ chooseStaff() {
+ this.openStaff = true
+ },
+ handleDataFromChild(data) {
+ this.openStaff = false
+
+ this.staff.staffId = data.mtStaffId,
+ this.staff.staffName = data.realName
+ console.log("realName",this.staff.staffName)
+ this.getHandover();
+ },
getHandover() {
- getHandoverApi().then(res=>{
+
+ getHandoverApi({staffId: this.staff.staffId}).then(res=>{
this.handoverList = res.data;
console.log("this.handoverList",this.handoverList)
+ // this.staff={
+ // staffId:'',
+ // staffName:null
+ // }
})
},
orderSummary() {
@@ -608,13 +649,15 @@ import Vue from 'vue';
recordData:JSON.stringify(recordData),
type:0,
status:this.handoverList.baseInfo.handoverType,
+ staffId:this.staff.staffId
}
addHandoverApi(handoverRecord).then(res=>{
if (flag) {
- removeUserId();
- this.$store.dispatch('LogOut').then(() => {
- location.href = '/';
- })
+ this.clean()
+ // removeUserId();
+ // this.$store.dispatch('LogOut').then(() => {
+ // location.href = '/';
+ // })
}
this.getHandover();
})
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue
index 62ff3c861..409a77f32 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue
@@ -7,16 +7,22 @@
交班详情
- 会员等级：{{ member.gradeId?getGrade(member.gradeId):'未知' }}
+ 会员等级：{{ gradeName }}
@@ -198,7 +198,7 @@
{{member.remark ? member.remark : "--"}}
- {{member.gradeId ? member.gradeId : "--"}}
+ {{member.gradeId ? getGradeName(gradeList,member.gradeId) : "--"}}
@@ -380,7 +380,7 @@
@@ -462,9 +462,10 @@ import {
import PointsCashier from "@/views/cashier/NewComponents/integralOrder/pointsCashier";
import {getDicts} from "@/api/dict/data";
import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/user";
- import {getUserGrade} from "@/api/cashier/usergrade";
+import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
import {connectFlag, getLodop} from "@/api/LodopFuncs";
+import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
export default {
name: "Integral",
@@ -499,6 +500,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
dialogVisiblevip:false, // 会员查询
dialogVisibleMember: false,// 模糊查询会员
dialogVisiblej: false,// 支付方式
+ visflg: false,// 支付方式
openShoppingCart: false,
openOrderHistory: false,
// 会员相关
@@ -509,7 +511,8 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
select1:'会员手机号',
// 会员信息
userNo:"",
-
+ gradeName:"",
+ gradeList:"",
// 员工相关
staffList:[],
staff:"",
@@ -533,6 +536,8 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
this.getPayList()
this.getStaffList();
this.getStaff();
+ this.getCouponList();
+
},
directives: {
// 注册一个局部的自定义指令 v-focus
@@ -714,12 +719,12 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
}
},
// 获取会员等级信息
- getGrade(id){
- getUserGrade(id).then( response => {
- this.gradeName = response.data.name;
- })
- return this.gradeName;
- },
+ // getGrade(id){
+ // getUserGrade(id).then( response => {
+ // this.gradeName = response.data.name;
+ // })
+ // return this.gradeName;
+ // },
// 重置会员
resetMember(){
this.member = {};
@@ -1084,10 +1089,37 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
},15000)
}
- this.printLocally()
+ if (this.isPaySuccess) {
+ this.printLocally()
+
+ }
// this.paymentType = ''
},
+ // 获取优惠券列表信息
+ getCouponList(){
+ listCardFavorableRecord().then(response => {
+ this.couponList = response.data.records
+ })
+ let map = {
+ page:1,
+ pageSize:20,
+ }
+ listUserGrade(map).then(response => {
+ this.gradeList = response.data.records
+ })
+ },
+ // 获取会员等级id
+ getGradeName(list,id){
+ let name = "";
+ list.forEach(item => {
+ if (item.id == id){
+ name = item.name
+ }
+ })
+ this.gradeName = name;
+ return name;
+ },
// 清楚数据
handClose(){
// if(this.isPaySuccess){
@@ -1109,6 +1141,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
// this.reset()
this.dialogVisiblej = false
+ this.visflg = false
this.authCode = '';
},
async printLocally(data) {
@@ -1201,7 +1234,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
},
watch: {
dialogVisiblej(newValue) {
- if (!newValue) {
+ if (!newValue && !this.visflg) {
console.log("newValue",newValue)
this.queryParams= {
@@ -1215,6 +1248,8 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
this.handClose()
this.reset()
+ } else {
+ this.visflg = false
}
}
},
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
index 5924e8c6f..f2e90269e 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
@@ -194,7 +194,7 @@ export default {
})
},
getStatistics() {
- getStatisticsApi().then(res=>{
+ getStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
this.statisticsForm = res.data
})
console.log("123123123",this.statisticsForm)
@@ -210,6 +210,7 @@ export default {
handleUpdate(){},
handleQuery(){
this.getList();
+ this.getStatistics();
},
resetQuery(){
@@ -222,6 +223,9 @@ export default {
pageSize:10
},
this.dateRange = []
+ this.getList()
+ this.getStatistics();
+
},
handleDetail(data){
this.openDetail = true
From 2a1e878492d87d2656b69590255fe9e6d85bb0b2 Mon Sep 17 00:00:00 2001
From: "@QQNZX"
Date: Wed, 28 Feb 2024 16:44:30 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/EventMarketing/cardExchange.js | 6 +
fuintAdmin/src/api/EventMarketing/oilBlock.js | 10 +-
.../EventMarketing/cardExchange/index.vue | 28 ++-
.../views/EventMarketing/giftBlock/index.vue | 177 +++++++++++----
.../EventMarketing/storeOilBlock/index.vue | 204 +++++++++++-------
5 files changed, 304 insertions(+), 121 deletions(-)
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 702e82032..908df7b25 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -42,3 +42,9 @@ export function delExchange(id) {
method: 'delete'
})
}
+export function getqueryGoods() {
+ return request({
+ url: 'business/convenience/goods/queryGoods',
+ method: 'get'
+ })
+}
diff --git a/fuintAdmin/src/api/EventMarketing/oilBlock.js b/fuintAdmin/src/api/EventMarketing/oilBlock.js
index d36c72aa2..750b0851e 100644
--- a/fuintAdmin/src/api/EventMarketing/oilBlock.js
+++ b/fuintAdmin/src/api/EventMarketing/oilBlock.js
@@ -51,7 +51,15 @@ export function deleteList(id) {
export function getoilnum(id) {
return request({
- url: 'petrolStationManagement/oilNumber/getOilPrice/'+id,
+ url: 'business/petrolStationManagement/oilNumber/getOilPrice/'+id,
+ method: 'get',
+
+ })
+}
+// 统计
+export function getstatistics() {
+ return request({
+ url: 'business/marketingActivity/cardFuelRecord/selectFuelRecordCount',
method: 'get',
})
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index dcd28aa14..79bc8153c 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -142,7 +142,7 @@
-
+
@@ -160,8 +160,16 @@
-
-
+
+
+
+
+
+
@@ -211,13 +219,15 @@ import {
getExchange,
delExchange,
addExchange,
- updateExchange
+ updateExchange,
+ getqueryGoods
} from '@/api/EventMarketing/cardExchange'
export default {
name: 'Exchange',
data() {
return {
+ goodsList:[],
labelPosition:'left',
centerDialogVisible: false,
loadingdialog:true,
@@ -290,6 +300,11 @@ export default {
},
methods: {
+ change(e){
+ console.log(e)
+ this.form.giftId = e
+
+ },
qrcodelook(url) {
this.loadingdialog = true
this.centerDialogVisible = true
@@ -317,6 +332,10 @@ export default {
this.total = response.data.total
this.loading = false
})
+ getqueryGoods().then(res=>{
+ console.log(res)
+ this.goodsList = res.data
+ })
},
// 取消按钮
cancel() {
@@ -377,6 +396,7 @@ export default {
},
/** 提交按钮 */
submitForm() {
+ console.log(this.form)
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index d858990e0..b2fe59e9e 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -50,65 +50,115 @@
-
-
-
- 总发卡量
-
-
-
+
-
- 面值:{{item.cardAmount || 0}}
+
+
总发卡量
+
+
暂无数据...
+
+
+
+
+
+
+ {{item.cardAmount || 0}}
-
- 总发卡金额:{{item.total || 0}}
-
-
- 总数量:{{item.count || 0}}
+
+ 面值
+
-
+
+
+ {{item.total || 0}}
+
+
+ 总发卡金额
+
+
+
+
+
{{item.count || 0}}
+
+ 总数量
+
+
+
+
+
-
- 已使用卡量
-
-
-
+
已使用卡量
+
+
暂无数据...
+
+
+
-
- 面值:{{item.cardAmount || 0}}
+
+
+ {{item.cardAmount || 0}}
-
- 总发卡金额:{{item.total || 0}}
-
-
- 总数量:{{item.count || 0}}
+
+ 面值
+
-
+
+
+ {{item.total || 0}}
+
+
+ 总发卡金额
+
+
+
+
+
{{item.count || 0}}
+
+ 总数量
+
+
+
+
+
-
- 未使用卡量
-
-
-
+
未使用卡量
+
+
暂无数据...
+
+
+
-
- 面值:{{item.cardAmount || 0}}
+
+
+ {{item.cardAmount || 0}}
-
- 总发卡金额:{{item.total || 0}}
-
-
- 总数量:{{item.count || 0}}
+
+ 面值
+
+
+ {{item.total || 0}}
+
+
+ 总发卡金额
+
+
+
+
+
{{item.count || 0}}
+
+ 总数量
+
+
+
+
-
@@ -452,9 +502,8 @@ import {
.tj{
width: 100%;
display: flex;
-
justify-content: space-between;
- margin-bottom: 20px;
+
}
.kar{
width: 100%;
@@ -462,14 +511,38 @@ import {
margin-bottom: 10px;
}
+ .one-size{
+ font-size: 20px;
+ font-weight: bold;
+ color: #000;
+ }
+.two-size{
+ font-size: 20px;
+ font-weight: bold;
+ color: #78b0fb;
+}
+.three-size{
+ font-size: 20px;
+ font-weight: bold;
+ color: #f73f3f;
+}
.ds{
width: 100%;
display: flex;
align-items: center;
+ background: #f4f4f4;
+ border-radius: 6px;
+ margin-bottom: 15px;
+ box-sizing: border-box;
+ padding: 15px 5px;
+ }
+ .tj-text{
+ font-size: 18px;
+ font-weight: bold;
}
.tj-num{
margin: 5px auto;
- font-size: 28px;
+ //font-size: 28px;
color: #666;
text-align: center;
}
@@ -494,5 +567,21 @@ import {
}
.sshi{
width: 33%;
+ background: #FFFFFF;
+ box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+ box-sizing: border-box;
+ padding: 15px;
+ border-radius: 6px;
+ //background: #f9f9f9;
+ }
+ .tjaocuo{
+ width: 100%;
+ margin-bottom: 15px;
+ display: flex;
+ justify-content: space-between;
+
+
+
+
}
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 8567844d1..e77dfefff 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -30,6 +30,20 @@
搜索
+
+ 统计
+
+
+
+
油品名称: {{item.oilName}}
+
总参与人数: {{item.peoples}}
+
售出总金额: {{item.money}}
+
售出总升数: {{item.litres}}
+
+
+
+
新增囤油卡
+
+
+
+
+
+
- {{scope.row.type}}
+
+
{{scope.row.createTime}}
+
---
+
{{scope.row.endTime}}
+
+
{{scope.row.stipulateTimeS}}
+
---
+
{{scope.row.stipulateTimeE}}
+
+
+
+
+
+
+
+
今日油价：{{oilPrice || ''}} 元/L 国标油价：{{oilPrice || ''}}元/L
+