bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

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

@@ -37,6 +37,7 @@
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
@@ -76,6 +77,7 @@
                        query.getCouponType())
                .eq(StringUtils.isNotNull(query.getDistributionMethod()),
                        Coupon::getDistributionMethod, query.getDistributionMethod())
                .orderByDesc(Coupon::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
@@ -150,6 +152,7 @@
     * @param dto 管理后台-优惠券数据传输对象
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateCoupon(MgtCouponDTO dto) {
        Coupon coupon = this.getById(dto.getId());
        if (StringUtils.isNull(coupon)) {
@@ -158,13 +161,20 @@
        coupon.setCouponName(dto.getCouponName());
        coupon.setDescription(dto.getDescription());
        this.updateById(coupon);
        couponMemberService.lambdaUpdate().set(CouponMember::getDescription, dto.getDescription())
                .eq(CouponMember::getCouponId, dto.getId()).update();
    }

    /**
     * 上架/下架
     *
     * @param dto 管理后台-优惠券上架下架数据传输对象
     */
    @Override
    public void updStatus(MgtCouponUpdDTO dto) {
        this.lambdaUpdate()
                .set(Coupon::getCouponStatus, dto.getCouponStatus())
                .eq(Coupon::getId, dto.getId());
                .eq(Coupon::getId, dto.getId()).update();
    }

    /**
@@ -177,6 +187,10 @@
    public PageDTO<CouponReceiveDetailVO> getReceiveDetail(MgtCouponReceiveQuery query) {
        MemberDTO memberDTO = getMemberQueryParam(query);
        Set<Long> memberIdSet = getMemberIdSet(memberDTO);
        if ((StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
                query.getPhone())) && CollUtils.isEmpty(memberIdSet)) {
            return PageDTO.empty(0L, 0L);
        }
        Page<CouponMember> page = couponMemberService.lambdaQuery()
                .eq(StringUtils.isNotNull(query.getCouponStatus()),
                        CouponMember::getCouponStatus, query.getCouponStatus())
@@ -199,7 +213,7 @@
        List<CouponReceiveDetailVO> usedCouponList = couponReceiveDetailVOList.stream()
                .filter(item -> item.getCouponStatus().equals(
                        CouponUseEnum.USED)).collect(Collectors.toList());
        Set<Long> couponIdSet = usedCouponList.stream().map(CouponReceiveDetailVO::getCouponId)
        Set<Long> couponIdSet = usedCouponList.stream().map(CouponReceiveDetailVO::getId)
                .collect(Collectors.toSet());
        Map<String, Order> orderMap = null;
        Map<Long, Member> memberMap = null;
@@ -229,15 +243,14 @@
                    couponReceiveDetailVO.setNickname(member.getNickname());
                    couponReceiveDetailVO.setPhone(member.getPhone());
                }
            } else if (StringUtils.isNotEmpty(orderMap)) {
                Order order = orderMap.get(couponReceiveDetailVO.getCouponId() + "-"
            }
            if (StringUtils.isNotEmpty(orderMap)) {
                Order order = orderMap.get(couponReceiveDetailVO.getId() + "-"
                        + couponReceiveDetailVO.getMemberId());
                if (StringUtils.isNotNull(order)) {
                    couponReceiveDetailVO.setOrderNo(order.getOrderNo());
                    couponReceiveDetailVO.setCreateTime(order.getCreateTime());
                    couponReceiveDetailVO.setUseTime(order.getCreateTime());
                }
            } else {
                break;
            }
        }
    }