修改bug

rentaiming

2024-07-12 867dde624b009fe1f288f292ea68699abd0600f7

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java

@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.CouponUseEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.forepart.vo.CouponMemberVO;
import com.ruoyi.promotion.domain.Coupon;
import com.ruoyi.promotion.mapper.CouponMapper;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
@@ -15,6 +17,8 @@
import com.ruoyi.system.api.domain.CouponMember;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;

import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -38,7 +42,7 @@
    private CouponMapper couponMapper;

    @Override
    public PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
    public PageDTO<CouponMemberVO> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
        wrapper.eq(Coupon::getDelFlag,0);
@@ -59,7 +63,13 @@
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        wrapper1.eq(CouponMember::getDelFlag,0);
        Page<CouponMember> page1 = this.page(page, wrapper1);
        return PageDTO.of(page1);
        PageDTO<CouponMemberVO> articleCommentsVOPageDTO = PageDTO.of(page1, CouponMemberVO.class);
        List<CouponMemberVO> list2 = articleCommentsVOPageDTO.getList();
        for (CouponMemberVO couponMember:list2){
            Coupon coupon = couponMapper.selectById(couponMember.getCouponId());
            couponMember.setCouponName(coupon.getCouponName());
        }
        return articleCommentsVOPageDTO;
    }

    @Override
@@ -75,7 +85,7 @@
    }

    @Override
    public List<CouponMember> getCouponMemberl(CouponMemberDTO couponMemberDTO) {
    public List<CouponMemberVO> getCouponMemberl(CouponMemberDTO couponMemberDTO) {

        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
@@ -94,11 +104,18 @@
        }
        wrapper1.eq(CouponMember::getDelFlag,0);
        List<CouponMember> page1 = this.list(wrapper1);
        return page1;
        List<CouponMemberVO> couponMemberVOS=new ArrayList<>();
        for (CouponMember couponMember:page1){
            CouponMemberVO couponMemberVO= BeanUtils.copyProperties(couponMember,CouponMemberVO.class);
            Coupon coupon = couponMapper.selectById(couponMemberVO.getCouponId());
            couponMemberVO.setCouponName(coupon.getCouponName());
            couponMemberVOS.add(couponMemberVO);
        }
        return couponMemberVOS;
    }

    @Override
    public List<CouponMember> updCouponMember1(CouponMemberDTO couponMemberDTO) {
    public List<CouponMemberVO> updCouponMember1(CouponMemberDTO couponMemberDTO) {

        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
@@ -118,6 +135,13 @@
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        wrapper1.eq(CouponMember::getDelFlag,0);
        List<CouponMember> page1 = this.list(wrapper1);
        return page1;
        List<CouponMemberVO> couponMemberVOS=new ArrayList<>();
        for (CouponMember couponMember:page1){
            CouponMemberVO couponMemberVO= BeanUtils.copyProperties(couponMember,CouponMemberVO.class);
            Coupon coupon = couponMapper.selectById(couponMemberVO.getCouponId());
            couponMemberVO.setCouponName(coupon.getCouponName());
            couponMemberVOS.add(couponMemberVO);
        }
        return couponMemberVOS;
    }
}