diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java index 654c6db46..479faa0ff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java @@ -1,9 +1,20 @@ package com.fuint.business.fleet.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.fleet.service.IFleetLinesChangeService; +import com.fuint.business.fleet.vo.FleetLinesChangeVo; +import com.fuint.business.order.dto.CardBalanceChangeDto; +import com.fuint.business.order.vo.CardBalanceChangeVo; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import io.lettuce.core.dynamic.annotation.Param; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestParam; /** *

@@ -15,6 +26,16 @@ import org.springframework.stereotype.Controller; */ @Controller @RequestMapping("/fleet-lines-change") -public class FleetLinesChangeController { +public class FleetLinesChangeController extends BaseController { + + @Autowired + private IFleetLinesChangeService fleetLinesChangeService; + public ResponseObject queryByPageUni(@RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + @Param("integralDetail") FleetLinesChangeVo fleetLinesChangeVo) { + Page page1 = new Page(page, pageSize); + IPage iPageList = fleetLinesChangeService.queryByPageUni(page1, fleetLinesChangeVo); + return getSuccessResult(iPageList); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java index c90c82ec5..012a080f3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java @@ -1,7 +1,10 @@ package com.fuint.business.fleet.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.fleet.entity.FleetLinesChange; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.fleet.vo.FleetLinesChangeVo; /** *

@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface FleetLinesChangeMapper extends BaseMapper { + IPage queryAllByLimit(Page page1, FleetLinesChangeVo fleetLinesChangeVo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetInfoService.java index 9259db0fd..095bc2185 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetInfoService.java @@ -6,6 +6,8 @@ import com.fuint.business.fleet.entity.FleetInfo; import com.fuint.business.fleet.vo.FleetInfoUniVo; import com.fuint.business.fleet.vo.FleetInfoVo; +import java.util.List; + /** * 车队信息(FleetInfo)表服务接口 * @@ -65,7 +67,7 @@ public interface FleetInfoService { * @param storeId * @return */ - FleetInfoUniVo queryByStoreId(Integer storeId); + List queryByStoreId(Integer storeId); /** * 新增车队信息(小程序) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java index 76864e7e8..54589f218 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java @@ -1,7 +1,10 @@ package com.fuint.business.fleet.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.fleet.entity.FleetLinesChange; import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.fleet.vo.FleetLinesChangeVo; /** *

@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IFleetLinesChangeService extends IService { + IPage queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java index 4fb9f0d26..9ddbc71b3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.fuint.business.fleet.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -35,9 +36,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Random; +import java.util.stream.Collectors; /** @@ -219,22 +222,29 @@ public class FleetInfoServiceImpl extends ServiceImpl * @return */ @Override - public FleetInfoUniVo queryByStoreId(Integer storeId) { + public List queryByStoreId(Integer storeId) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - - FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(FleetInfo::getStoreId, storeId) - .eq(FleetInfo::getUserId, nowAccountInfo.getId()) - .last("limit 1")); - - if (ObjectUtil.isEmpty(fleetInfo)) { - throw new RuntimeException("该会员未绑定车队"); + //查询当前登录人的车队信息 + List fleetMembers = fleetMemberMapper.selectList(new LambdaQueryWrapper() + .eq(FleetMember::getStoreId, storeId) + .eq(FleetMember::getUserId, nowAccountInfo.getId())); + //获取所在车队的id集合 + List fleetIds = fleetMembers.stream().map(FleetMember::getFleetId).collect(Collectors.toList()); + if (CollUtil.isEmpty(fleetIds)) { + throw new RuntimeException("未绑定车队"); } -// FleetInfo fleetInfo = baseMapper.selectById(fleetMember.getFleetId()); - FleetInfoUniVo fleetInfoUniVo = BeanUtil.copyProperties(fleetInfo, FleetInfoUniVo.class); - fleetInfoUniVo.setStoreName(mtStoreMapper.selectById(storeId).getName()); - return fleetInfoUniVo; + List fleetInfos = baseMapper.selectList(new LambdaQueryWrapper() + .eq(FleetInfo::getStoreId, storeId) + .in(FleetInfo::getId, fleetIds)); + + List fleetInfoUniVos = new ArrayList<>(); + for (FleetInfo fleetInfo : fleetInfos) { + FleetInfoUniVo fleetInfoUniVo = BeanUtil.copyProperties(fleetInfo, FleetInfoUniVo.class); + fleetInfoUniVo.setStoreName(mtStoreMapper.selectById(storeId).getName()); + fleetInfoUniVos.add(fleetInfoUniVo); + } + return fleetInfoUniVos; } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java index 48b7308c3..58267200b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java @@ -1,9 +1,18 @@ package com.fuint.business.fleet.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.fleet.entity.FleetLinesChange; import com.fuint.business.fleet.mapper.FleetLinesChangeMapper; import com.fuint.business.fleet.service.IFleetLinesChangeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.fleet.vo.FleetLinesChangeVo; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +26,17 @@ import org.springframework.stereotype.Service; @Service public class FleetLinesChangeServiceImpl extends ServiceImpl implements IFleetLinesChangeService { + @Autowired + private FleetLinesChangeMapper fleetLinesChangeMapper; + @Override + public IPage queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + fleetLinesChangeVo.setUserId(nowAccountInfo.getId()); + if (ObjectUtil.isNotEmpty(fleetLinesChangeVo.getStartTime())) { + DateTime parse = DateUtil.parse(fleetLinesChangeVo.getStartTime(), "yyyy-MM"); + fleetLinesChangeVo.setStartTime(DateUtil.beginOfMonth(parse).toString()); + fleetLinesChangeVo.setEndTime(DateUtil.endOfMonth(parse).toString()); + } + return this.baseMapper.queryAllByLimit(page1, fleetLinesChangeVo); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetLinesChangeVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetLinesChangeVo.java index 8f016337e..d4d89ec50 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetLinesChangeVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetLinesChangeVo.java @@ -1,5 +1,6 @@ package com.fuint.business.fleet.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fuint.business.fleet.entity.FleetLinesChange; import lombok.Data; @@ -13,4 +14,10 @@ public class FleetLinesChangeVo extends FleetLinesChange { * 操作人名称 */ private String creatName; + + @JsonIgnore + private String startTime; + + @JsonIgnore + private String endTime; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java index 48c68c7ec..834c3f872 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java @@ -1,5 +1,6 @@ package com.fuint.business.marketingActivity.cardGift.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,6 +13,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.cardGift.mapper.CardGiftMapper; import com.fuint.business.marketingActivity.cardGift.entity.CardGift; import com.fuint.business.marketingActivity.cardGift.service.CardGiftService; +import com.fuint.business.marketingActivity.cardGift.vo.CardGiftVo; +import com.fuint.business.marketingActivity.cardGiftActive.entity.CardGiftActive; +import com.fuint.business.marketingActivity.cardGiftActive.mapper.CardGiftActiveMapper; import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.oilDepotConfiguration.entity.OilDepotConfig; @@ -30,6 +34,7 @@ import com.fuint.common.util.TokenUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -64,6 +69,8 @@ public class CardGiftServiceImpl extends ServiceImpl i private LJUserService ljUserService; @Resource private ILJStaffService ljStaffService; + @Autowired + private CardGiftActiveMapper cardGiftActiveMapper; /** * 新增数据 @@ -246,7 +253,23 @@ public class CardGiftServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CardGift::getUserId,userId); queryWrapper.orderByDesc(CardGift::getUpdateTime); - return page(page,queryWrapper); + IPage page1 = page(page, queryWrapper); + List cardGiftVos = new ArrayList<>(); + for (Object record : page1.getRecords()) { + CardGiftVo cardGiftVo = BeanUtil.copyProperties(record, CardGiftVo.class); + CardGiftActive cardGiftActive = cardGiftActiveMapper.selectOne(new LambdaQueryWrapper() + .eq(CardGiftActive::getId, cardGiftVo.getActiveId()) + .last("limit 1")); + if (ObjectUtils.isNotEmpty(cardGiftActive)) { + cardGiftVo.setActiveName(cardGiftActive.getActiveName()); + } + cardGiftVos.add(cardGiftVo); + } + page1.setRecords(cardGiftVos); + + //查询兑换记录的活动名称 + + return page1; } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/vo/CardGiftVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/vo/CardGiftVo.java new file mode 100644 index 000000000..ffe1ee7a4 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/vo/CardGiftVo.java @@ -0,0 +1,9 @@ +package com.fuint.business.marketingActivity.cardGift.vo; + +import com.fuint.business.marketingActivity.cardGift.entity.CardGift; +import lombok.Data; + +@Data +public class CardGiftVo extends CardGift { + private String activeName; +}