From a7272a1b4f5be4195c6be786a07a3b14e878d58c Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 18 Oct 2024 09:30:32 +0800
Subject: [PATCH] 10.18

---
 .../printer/template/PrintOilOrderReport.java   |  2 +-
 .../service/impl/UserBalanceServiceImpl.java    |  2 +-
 .../src/views/cashier/NewComponents/newHome.vue | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
index 6a9a5332a..8ce7d3e2c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
@@ -82,7 +82,7 @@ public class PrintOilOrderReport {
 
         }
         if (ObjectUtil.isNotEmpty(handover.get("consumeRefuelMoney"))) {
-            sb.append("囤油卡付款："+handover.get("consumeRefuelMoney")+"L\r\n");
+            sb.append("囤油卡付款：￥"+handover.get("consumeRefuelMoney")+"\r\n");
             sb.append("--------------------------------\r\n");
 
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index 6260f27b2..e4af0ba5b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -333,7 +333,7 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
             growthValue = growth * growthValue;
             //更新用户余额表成长值
             UserBalance userBalance = baseMapper.selectOne(new LambdaQueryWrapper<UserBalance>()
-                    .eq(UserBalance::getMtUserId, userId));
+                    .eq(UserBalance::getMtUserId, userId).eq(UserBalance::getStoreId, storeId));
             userBalance.setGrowthValue(userBalance.getGrowthValue() + growthValue);
 
             //更新成长值记录变化表
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 5bb550a14..715c66a83 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -1114,9 +1114,10 @@ export default {
         'WECHAT': '微信',
         'ALIPAY': '支付宝',
         'UNIONPAY': '银联二维码',
-        'credit': '挂账',
-        'oilCard': '囤油卡',
-        'balance': '储值卡'
+        'after_pay': '挂账',
+        'fule_card': '囤油卡',
+        'card_value': '储值卡',
+        'car_card_value': '车队卡',
       };
       let payTypeText = payTypeMap[this.payType] || '小程序码';
 
@@ -1127,15 +1128,15 @@ export default {
         unitName: "", // 挂账单位
 
         // consumeAmount:this.consumeAmount,
-        creditAmount: (this.oilAmount + (+this.goodsAmount)).toFixed(2),//挂账金额
+        creditAmount: this.realAmount.toFixed(2),//挂账金额
         // 优惠合计
-        discount: (this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计
+        discount: this.disTotal.toFixed(2), // 油惠合计
         // 储值卡付款
-        consumeAmount: this.consumeAmount,
+        consumeAmount: this.realAmount.toFixed(2),
         // 屯油卡付款
-        consumeRefuelMoney: this.consumeRefuelMoney ? this.consumeRefuelMoney.toFixed(2) : 0,
+        consumeRefuelMoney: this.realAmount.toFixed(2),
         // 实付款
-        actualPay: ((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2),
+        actualPay: this.realAmount.toFixed(2),
         // 找零
         seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0,
       }