no message
This commit is contained in:
wangh
parent
00386746aa
commit
570f8c9c0f
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml
fuintCashierWeb/src/views/cashier
@ -99,6 +99,48 @@
|
||||
</if>
|
||||
</where>
|
||||
) AS numberOfStrokes, -- 笔数
|
||||
(SELECT count(*) FROM cashier_order
|
||||
<where>
|
||||
store_id = #{order.storeId}
|
||||
and oil_order_id is not null
|
||||
<if test="order.staffId != null and order.staffId != ''">
|
||||
and staff_id = #{order.staffId}
|
||||
</if>
|
||||
<if test="order.orderNo != null and order.orderNo != ''">
|
||||
and order_no like concat('%', #{order.orderNo}, '%')
|
||||
</if>
|
||||
<if test="order.terminal != null and order.terminal != ''">
|
||||
and terminal like concat('%', #{order.terminal}, '%')
|
||||
</if>
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''">
|
||||
and date_format(pay_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''">
|
||||
and date_format(pay_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d')
|
||||
</if>
|
||||
</where>
|
||||
) AS numberOfStrokesByOil, -- 笔数
|
||||
(SELECT count(*) FROM cashier_order
|
||||
<where>
|
||||
store_id = #{order.storeId}
|
||||
and goods_order_id is not null
|
||||
<if test="order.staffId != null and order.staffId != ''">
|
||||
and staff_id = #{order.staffId}
|
||||
</if>
|
||||
<if test="order.orderNo != null and order.orderNo != ''">
|
||||
and order_no like concat('%', #{order.orderNo}, '%')
|
||||
</if>
|
||||
<if test="order.terminal != null and order.terminal != ''">
|
||||
and terminal like concat('%', #{order.terminal}, '%')
|
||||
</if>
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''">
|
||||
and date_format(pay_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''">
|
||||
and date_format(pay_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d')
|
||||
</if>
|
||||
</where>
|
||||
) AS numberOfStrokesByGoods, -- 笔数
|
||||
(SELECT sum(amount) FROM cashier_order
|
||||
<where>
|
||||
store_id = #{order.storeId}
|
||||
|
||||
@ -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)
|
||||
}
|
||||
},
|
||||
// 打开订单记录
|
||||
|
||||
@ -54,9 +54,19 @@
|
||||
<span>收银台订单统计</span>
|
||||
</div>
|
||||
<div class="box-gang">
|
||||
<div class="box">
|
||||
<div class="size-hui">笔数</div>
|
||||
<div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
|
||||
<div class="box" style="display: flex;align-items: center;width: 250px">
|
||||
<div>
|
||||
<div class="size-hui">笔数</div>
|
||||
<div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
|
||||
</div>
|
||||
<div style="margin-left: 30px">
|
||||
<div class="size-hui" >油品笔数</div>
|
||||
<div class="size-bole">{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}</div>
|
||||
</div>
|
||||
<div style="margin-left: 30px">
|
||||
<div class="size-hui">商品笔数</div>
|
||||
<div class="size-bole">{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="size-hui">订单总金额</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user