From 3c6defd2c6cb33edc410695ad93f7cb7d553409f Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 6 Feb 2024 16:48:14 +0800 Subject: [PATCH] bug --- fuintAdmin/src/views/order/order_Cashier.vue | 4 ++-- .../java/com/fuint/business/order/entity/CashierOrder.java | 4 ++-- .../business/order/service/impl/OilOrderServiceImpl.java | 4 ++++ .../src/views/cashier/orderComponents/order_Cashier.vue | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 082a4f10a..a7fdb19d6 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -115,12 +115,12 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java index 948ba2a87..b906f6fd8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java @@ -76,11 +76,11 @@ public class CashierOrder extends BaseEntity implements Serializable { */ private Double goodsDiscountAmount; /** - * 商品优惠金额 + * 油品实付金额 */ private Double oilPayAmount; /** - * 商品优惠金额 + * 商品实付金额 */ private Double goodsPayAmount; /** 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 ea85c8997..86e15e4cf 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 @@ -410,6 +410,8 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setPayUser(payUser); cashierOrder.setAmount(oilAmount+goodsAmount); cashierOrder.setStatus(payStatus); + cashierOrder.setOilPayAmount(oilActualPay); + cashierOrder.setGoodsPayAmount(goodsActualPay); if (payType.equals("CASH")){ if (StringUtils.isNotEmpty(map.get("authCode"))){ cashierOrder.setPayAmount(Double.valueOf(map.get("authCode"))); @@ -742,6 +744,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setAmount(oilAmount); + cashierOrder.setOilPayAmount(oilAmount); cashierOrder.setPayAmount(oilAmount); cashierOrder.setStatus(status); cashierOrder.setPayTime(new Date()); @@ -806,6 +809,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setAmount(oilAmount); + cashierOrder.setOilPayAmount(oilAmount); cashierOrder.setPayAmount(oilAmount); cashierOrder.setStatus("paid"); cashierOrder.setPayTime(new Date()); diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index f4fb0a5e4..e05340b5e 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -126,12 +126,12 @@