dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

Browse Source
This commit is contained in:
zhaohengkun 2024-10-08 15:15:28 +08:00
commit cbc9fc0ae2
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -1,11 +1,16 @@
package com.fuint.business.userManager.service.impl; package com.fuint.business.userManager.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.entity.CardValueRecord;
import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
@ -65,6 +70,10 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
private OilOrderService orderService; private OilOrderService orderService;
@Autowired @Autowired
private IMtUserFuelService userFuelService; 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<>(); LambdaQueryWrapper<MtUserFuel> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(MtUserFuel::getStoreId,storeId).eq(MtUserFuel::getMtUserId,nowAccountInfo.getId()); queryWrapper.eq(MtUserFuel::getStoreId,storeId).eq(MtUserFuel::getMtUserId,nowAccountInfo.getId());
List<MtUserFuel> list = userFuelService.list(queryWrapper); List<MtUserFuel> list = userFuelService.list(queryWrapper);
//判断当前用户是否存在车队
List<FleetInfoUniVo> fleetInfoUniVos = fleetInfoService.queryByStoreId(storeId);
if (CollUtil.isNotEmpty(fleetInfoUniVos)) {
ljUserVo.setFleetInfoUniVos(fleetInfoUniVos);
}
ljUserVo.setUserFuels(list); ljUserVo.setUserFuels(list);
return ljUserVo; return ljUserVo;
} }

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
View File

@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; 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.entity.MtUserFuel;
import com.fuint.business.userManager.util.GenderConverter; import com.fuint.business.userManager.util.GenderConverter;
import com.fuint.framework.entity.BaseEntity; import com.fuint.framework.entity.BaseEntity;
@ -165,4 +166,9 @@ public class LJUserVo extends BaseEntity {
private String userSource; private String userSource;
//囤油卡信息 //囤油卡信息
private List<MtUserFuel> userFuels; private List<MtUserFuel> userFuels;
/**
* 车队信息
*/
List<FleetInfoUniVo> fleetInfoUniVos;
} }

4
gasStation-uni/pagesMy/integral/integral.vue
View File

@ -18,8 +18,8 @@
<view style="width: 85%;"> <view style="width: 85%;">
<view class="right-box"> <view class="right-box">
<view class="l-text">{{item.changeReason}}</view> <view class="l-text">{{item.changeReason}}</view>
<view class="r-text" v-if="item.changeType==1">{{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-if="item.changeType==0">{{item.pointsChange}}</view>
<view class="r-text" v-else>0</view> <view class="r-text" v-else>0</view>
</view> </view>
<view class="right-box"> <view class="right-box">