From d7dddcc9481c40842bba7d9908b330213467c84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 8 Oct 2024 15:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LJUserServiceImpl.java            | 14 ++++++++++++++
 .../fuint/business/userManager/vo/LJUserVo.java    |  6 ++++++
 gasStation-uni/pagesMy/integral/integral.vue       |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index f069bbbfb..5d1f8e61a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -1,11 +1,16 @@
 package com.fuint.business.userManager.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.fleet.entity.FleetMember;
+import com.fuint.business.fleet.mapper.FleetMemberMapper;
+import com.fuint.business.fleet.service.FleetInfoService;
+import com.fuint.business.fleet.vo.FleetInfoUniVo;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
 import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
@@ -65,6 +70,10 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
     private OilOrderService orderService;
     @Autowired
     private IMtUserFuelService userFuelService;
+    @Autowired
+    private FleetInfoService fleetInfoService;
+    @Autowired
+    private FleetMemberMapper fleetMemberMapper;
 
     /**
      * 根据条件分页查询会员信息
@@ -339,6 +348,11 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         LambdaQueryWrapper<MtUserFuel> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(MtUserFuel::getStoreId,storeId).eq(MtUserFuel::getMtUserId,nowAccountInfo.getId());
         List<MtUserFuel> list = userFuelService.list(queryWrapper);
+        //判断当前用户是否存在车队
+        List<FleetInfoUniVo> fleetInfoUniVos = fleetInfoService.queryByStoreId(storeId);
+        if (CollUtil.isNotEmpty(fleetInfoUniVos)) {
+            ljUserVo.setFleetInfoUniVos(fleetInfoUniVos);
+        }
         ljUserVo.setUserFuels(list);
         return ljUserVo;
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
index 86a2da580..360a92711 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fuint.business.fleet.vo.FleetInfoUniVo;
 import com.fuint.business.userManager.entity.MtUserFuel;
 import com.fuint.business.userManager.util.GenderConverter;
 import com.fuint.framework.entity.BaseEntity;
@@ -165,4 +166,9 @@ public class LJUserVo extends BaseEntity {
     private String userSource;
     //囤油卡信息
     private List<MtUserFuel> userFuels;
+
+    /**
+     * 车队信息
+     */
+    List<FleetInfoUniVo> fleetInfoUniVos;
 }
diff --git a/gasStation-uni/pagesMy/integral/integral.vue b/gasStation-uni/pagesMy/integral/integral.vue
index 4043574e7..4ce8fcab7 100644
--- a/gasStation-uni/pagesMy/integral/integral.vue
+++ b/gasStation-uni/pagesMy/integral/integral.vue
@@ -18,8 +18,8 @@
 				<view style="width: 85%;">
 					<view class="right-box">
 						<view class="l-text">{{item.changeReason}}</view>
-						<view class="r-text" v-if="item.changeType==1">{{item.pointsChange}}</view>
-						<view class="r-text" v-else-if="item.changeType==0">-{{item.pointsChange}}</view>
+						<view class="r-text" v-if="item.changeType==1">+{{item.pointsChange}}</view>
+						<view class="r-text" v-else-if="item.changeType==0">{{item.pointsChange}}</view>
 						<view class="r-text" v-else>0</view>
 					</view>
 					<view class="right-box">