From f35039da9b1b1e97c12ddfa24170994ff94b0aad Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Thu, 14 Nov 2024 14:04:58 +0800
Subject: [PATCH] 11.14

---
 .../order/service/impl/AllOrderInfoServiceImpl.java       | 1 +
 .../business/order/service/impl/OilOrderServiceImpl.java  | 2 +-
 .../src/views/cashier/NewComponents/newHome.vue           | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

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 cf0083191..e41434d61 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
@@ -666,6 +666,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
             // 更新油品订单状态
             oilOrder.setOrderStatus("refund");
             oilOrderMapper.updateById(oilOrder);
+            userBalance.setGiveAmount((new BigDecimal(oilOrder.getBalanceGiftAmount().toString()).add(new BigDecimal(userBalance.getGiveAmount().toString()))).doubleValue());
         }
 //      如果订单有商品
         if (ObjectUtil.isNotEmpty(cashierOrder.getGoodsOrderId())) {
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 5ff761625..de452049e 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
@@ -636,7 +636,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             order.setBalanceAmount(Double.valueOf(balanceAmount));
             order.setOilCardAmount(Double.valueOf(oilCardAmount));
             order.setActiveAmount(activeAmount);
-            order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(balanceAmount), userId, storeId, orderNo));
+            order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(amount), userId, storeId, orderNo));
             order.setStoreId(storeId);
             order.setUserId(userId);
             order.setStaffId(staffId);
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 701ee2f0a..144c0e95b 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -1185,9 +1185,13 @@ export default {
         'car_card_value': '车队卡',
       };
       let payTypeText = payTypeMap[this.payType] || '小程序码';
-
+      let mm=[]
+      mm.push({
+        orderNo:this.orderNo,
+        payUser:this.chooseVipUser.mobile
+      })
       let f = {
-        oilOrder: oilOrderR,
+        oilOrder: mm,
         goodsOrder: goodsOrderR,
         payType: payTypeText,
         unitName: "", // 挂账单位