Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

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

@@ -2,20 +2,20 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
import com.ruoyi.promotion.service.IPromotionWishListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import util.HuaWeiOBSUtil;

import javax.annotation.Resource;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

/**
 * <p>
@@ -31,10 +31,13 @@
    @Resource
    private  IPromotionWishListService iPromotionWishListService;
    @Override
    public List<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {
    public PageDTO<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {

        Page<PromotionWishList> page = new Page<>(promotionWishListDTO.getPageCurr(), promotionWishListDTO.getPageSize());
        LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(PromotionWishList::getMemberId,promotionWishListDTO.getMemberId());
        return iPromotionWishListService.list(wrapper);
        Page<PromotionWishList> page1 = iPromotionWishListService.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override