From 18f724d177a0ca8b0dde8ff3da4ae2f41e7c13e3 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 14 Oct 2024 14:56:04 +0800
Subject: [PATCH] 10.14

---
 .../business/order/service/impl/OilOrderServiceImpl.java   | 5 +++++
 .../userManager/service/impl/UserBalanceServiceImpl.java   | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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 2c2c14fd8..55c7f88b9 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
@@ -1188,6 +1188,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         order.setInvoicing("未开票");
         order.setOrderStatus("paid");
         order.setPayTime(new Date());
+        order.setTankId(Integer.valueOf(oilOrders.get("tankId").toString()));
         this.addOilTracks(order, accountInfo.getStoreId());
         if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))) {
             baseMapper.updateById(order);
@@ -1195,7 +1196,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             baseMapper.insert(order);
         }
 
+        // 计算成长值
         this.updateGrowthValue1(oilAmount, 0.0, userId, Integer.valueOf(order.getOils()), 0.0, storeId, orderNo);
+        // 修改囤油卡升数信息
+//        userFuelService.
+        // 修改储值卡余额信息
 
         cashierOrder.setStaffId(order.getStaffId());
         cashierOrder.setStoreId(accountInfo.getStoreId());
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 10800cc8a..6260f27b2 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
@@ -351,8 +351,11 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
             growthValueChangeMapper.insert(growthValueChange);
 
 
-            List<MtUserGrade> mtUserGrades = mtUserGradeMapper.selectList(new LambdaQueryWrapper<MtUserGrade>()
-                    .eq(MtUserGrade::getStoreId, storeId));
+//            List<MtUserGrade> mtUserGrades = mtUserGradeMapper.selectList(new LambdaQueryWrapper<MtUserGrade>()
+//                    .eq(MtUserGrade::getStoreId, storeId));
+            QueryWrapper queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("store_id", storeId);
+            List<LJUserGrade> mtUserGrades = ljUserGradeMapper.selectList(queryWrapper);
 
             //判断当前用户等级
             for (int i = 0; i < mtUserGrades.size(); i++) {