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

营销活动

Browse Source
This commit is contained in:
13405411873 2024-10-08 14:29:58 +08:00
parent deb3db0b95
commit 5a65086d4d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.fuint.business.userManager.service.impl;
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;
@ -62,6 +63,8 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
@Autowired
@Lazy
private OilOrderService orderService;
@Autowired
private IMtUserFuelService userFuelService;
/**
* 根据条件分页查询会员信息
@ -330,7 +333,14 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
public LJUserVo queryUserByStoreIdAndUserId(Integer storeId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
LJStore store = storeService.selectStoreByStoreId(storeId);
return baseMapper.queryUserByChainStoreId(nowAccountInfo.getId(),store.getChainStoreId());
LJUserVo ljUserVo = baseMapper.queryUserByChainStoreId(nowAccountInfo.getId(), store.getChainStoreId());
//用户的储值卡总额 = 储值金额+赠送金额 要记得使用
//在查询囤油卡信息
LambdaQueryWrapper<MtUserFuel> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(MtUserFuel::getStoreId,storeId).eq(MtUserFuel::getMtUserId,nowAccountInfo.getId());
List<MtUserFuel> list = userFuelService.list(queryWrapper);
ljUserVo.setUserFuels(list);
return ljUserVo;
}
@Override

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

@ -5,12 +5,15 @@ 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.userManager.entity.MtUserFuel;
import com.fuint.business.userManager.util.GenderConverter;
import com.fuint.framework.entity.BaseEntity;
import com.fuint.repository.model.MtUser;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
@ExcelIgnoreUnannotated
@ -160,4 +163,6 @@ public class LJUserVo extends BaseEntity {
* 用户来源：员工码；门店扫码；会员导入；会员邀请
*/
private String userSource;
//囤油卡信息
private List<MtUserFuel> userFuels;
}