修改bug

rentaiming

2024-07-26 8d738d847973e1184a704b5ca3d4f492bffdb03f

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

@@ -39,7 +39,7 @@
    @Override
    public PageDTO<CouponMemberVO> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
        wrapper.eq(Coupon::getDelFlag,0);
        List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
        Set<Long> CouponList = null;
@@ -53,7 +53,7 @@
                    CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
        }
        if (CouponList.size()>0){
            wrapper1.notIn(CouponMember::getCouponId,CouponList);
            wrapper1.in(CouponMember::getCouponId,CouponList);
        }
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        wrapper1.eq(CouponMember::getDelFlag,0);
@@ -82,7 +82,7 @@
    @Override
    public List<CouponMemberVO> getCouponMemberl(CouponMemberDTO couponMemberDTO) {
        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
        wrapper.eq(Coupon::getDelFlag,0);
        List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
        Set<Long> CouponList = null;
@@ -93,7 +93,7 @@
        wrapper1.eq(CouponMember::getCouponStatus, 0);
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        if (CouponList.size()>0){
            wrapper1.notIn(CouponMember::getCouponId,CouponList);
            wrapper1.in(CouponMember::getCouponId,CouponList);
        }
        wrapper1.eq(CouponMember::getDelFlag,0);
        List<CouponMember> page1 = this.list(wrapper1);
@@ -111,21 +111,19 @@
    public List<CouponMemberVO> updCouponMember1(CouponMemberDTO couponMemberDTO) {

        LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
        wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
        wrapper.eq(Coupon::getDelFlag,0);
        List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
        Set<Long> CouponList = null;
        CouponList = couponMemberList.stream().map(Coupon::getId)
                .collect(Collectors.toSet());


        LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(CouponMember::getCouponStatus,
                CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
        if (CouponList.size()>0){
            wrapper1.notIn(CouponMember::getCouponId,CouponList);
        }
        wrapper1.eq(CouponMember::getCouponStatus, 0);
        wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
        if (CouponList.size()>0){
            wrapper1.in(CouponMember::getCouponId,CouponList);
        }
        wrapper1.eq(CouponMember::getDelFlag,0);
        List<CouponMember> page1 = this.list(wrapper1);
        List<CouponMemberVO> couponMemberVOS=new ArrayList<>();