写用户端接口

rentaiming

2024-05-24 c9e904c9533944c491d348e2a35c78bddc28db4b

写用户端接口

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java

@@ -19,9 +19,6 @@
 * @since 2023-05-29
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_delay_task")
public class DelayTask implements Serializable {

    private static final long serialVersionUID = 1L;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeckill.java

File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeckill.java
@@ -1,22 +1,18 @@
package com.ruoyi.goods.domain;
package com.ruoyi.system.api.domain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * <p>
 * 商品秒杀表

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -56,6 +57,9 @@
    @ApiModelProperty(value = "库存")
    private Integer stock;

    @ApiModelProperty(value = "已售数量")
    private Integer soldQuantity;

    @ApiModelProperty(value = "单位")
    private String unit;

@@ -69,7 +73,7 @@
    private String coverPic;

    @ApiModelProperty(value = "详情图，不超过五张图片")
    private String alubm;
    private String album;

    @ApiModelProperty(value = "分享标题")
    private String shareTitle;
@@ -87,7 +91,7 @@
    private Integer sortNum;

    @ApiModelProperty(value = "上架状态 0=上架中 1= 已下架")
    private Integer listingStatus;
    private ListingStatusEnum listingStatus;

    @ApiModelProperty(value = "创建者")
    @TableField(value = "create_by", fill = FieldFill.INSERT)

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java

@@ -70,5 +70,14 @@
    @TableLogic
    private Integer isDefault;

    @ApiModelProperty(value = "省份/直辖市")
    private String receiverProvince;

    @ApiModelProperty(value = "省")
    private String receiverCity;

    @ApiModelProperty(value = "区")
    private String receiverRegion;


}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import org.slf4j.Logger;
@@ -21,6 +22,11 @@
            }

            @Override
            public R<GoodsSeckill> getGoodsSeckillOne(Long goodsSkuId) {
                return R.fail("通过id查询秒杀商品失败:" + cause.getMessage());
            }

            @Override
            public R<Boolean> updateGoodsSkuOne(GoodsSku goodsSku) {
                return R.fail("更新商品失败:" + cause.getMessage());
            }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java

@@ -1,12 +1,9 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.web.bind.annotation.PathVariable;

/**
 * @author mitao

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java

@@ -2,6 +2,7 @@

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.factory.GoodsSkuFactory;
import org.springframework.cloud.openfeign.FeignClient;
@@ -19,6 +20,9 @@
    @PostMapping("/goods-sku/getGoodsSkuOne")
    R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId);

    @PostMapping("/goods-seckill/getGoodsSeckillOne")
    R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId);


    @PostMapping("/goods-sku/updateGoodsSkuOne")
    R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku);

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java

@@ -2,7 +2,6 @@

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.factory.MemberFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java

@@ -3,11 +3,9 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.PromotionFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java

@@ -8,6 +8,7 @@
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

@@ -37,7 +38,7 @@
    @RequestMapping("getAuctionBidRecordList")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏获取拍卖信息")
    public R<List<AuctionSalesroom>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
    public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
        return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));

    }

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java

@@ -1,10 +1,11 @@
package com.ruoyi.auction.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class AuctionSalesroomGoodsDTO {
public class AuctionSalesroomGoodsDTO extends BasePage {
    @ApiModelProperty(value = "拍卖场id")
    private Long auctionSalesroomId;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java

@@ -1,10 +1,11 @@
package com.ruoyi.auction.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class ForepartAuctionVideo {
public class ForepartAuctionVideo extends BasePage {
    @ApiModelProperty(value = "视频id")
    private Long promotionVideoId;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java

@@ -5,6 +5,7 @@
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
@@ -22,14 +23,14 @@
     * 拍卖大屏获取拍卖信息
     *
     */
    public List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
    PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);

    /**
     * 暖场视频or封面海报
     *
     */
    public ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
     ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);


    public AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
     AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
}

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

@@ -2,6 +2,8 @@

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.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
@@ -11,6 +13,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
@@ -39,22 +44,23 @@


    @Override
    public List<AuctionSalesroom> getAuctionBidRecordList(String salesroomName) {
    public PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        Page<AuctionSalesroom> page = new Page<>(ationSalesroomGoodsDTO.getPageCurr(), ationSalesroomGoodsDTO.getPageSize());
        LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
        wrapper.eq(AuctionSalesroom::getSalesroomName,salesroomName);
        wrapper.eq(AuctionSalesroom::getSalesroomName,ationSalesroomGoodsDTO.getSalesroomName());
        wrapper.eq(AuctionSalesroom::getDelFlag,0);
        List<AuctionSalesroom> auctionBidRecordList=iAuctionSalesroomService.list(wrapper);
        return auctionBidRecordList;
        Page<AuctionSalesroom> page1=iAuctionSalesroomService.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override
    public ForepartAuctionSalesroomVO getBaaner(Integer SalesroomId) {
    public ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        LambdaQueryWrapper<AuctionVideo> wrapper=Wrappers.lambdaQuery();
        wrapper.eq(AuctionVideo::getAuctionSalesroomId,SalesroomId);
        wrapper.eq(AuctionVideo::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper.eq(AuctionVideo::getDelFlag,0);
        AuctionVideo auctionVideo=iAuctionVideoService.getOne(wrapper);
        ForepartAuctionSalesroomVO forepartAuctionSalesroomVO =new ForepartAuctionSalesroomVO();
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
        forepartAuctionSalesroomVO.setAuctionSalesroomStatus(auctionSalesroom.getStatus().getCode());
        if (auctionVideo!=null){
            forepartAuctionSalesroomVO.setUrl(auctionVideo.getPromotionVideoUrl());
@@ -70,15 +76,15 @@
        SysUser sysUser=r.getData();

        if (sysUser!=null){
            R.fail("手机号未注册");
            throw new ServiceException("手机号未注册");
        }

        if (!sysUser.getPassword().equals(arepartAuctionBidRecordDTO.getPassword())){
            R.fail("密码输入错误");
            throw new ServiceException("密码输入错误");
        }

        if (!sysUser.getUserType().equals("2")){
            R.fail("该人员不是拍卖师");
            throw new ServiceException("该人员不是拍卖师");
        }

        LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSeckillController.java

@@ -4,12 +4,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -27,6 +25,12 @@

    private final IGoodsSeckillService goodsSeckillService;

    @PostMapping("/getGoodsSeckillOne")
    @ResponseBody
    public R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Integer goodsSkuId) {
        GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsSkuId);
        return R.ok(GoodsSeckillOne);
    }
    /**
     * 开始秒杀
     *

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java

@@ -2,9 +2,10 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.goods.service.IGoodsSkuService;
import javax.annotation.Resource;

import com.ruoyi.system.api.domain.GoodsSku;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSku.java

File was deleted

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeckillMapper.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.goods.controller.management.VO.GoodsSeckillVO;
import com.ruoyi.goods.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSeckill;
import org.apache.ibatis.annotations.Param;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSkuMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.goods.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.system.api.domain.GoodsSku;

/**
 * <p>

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeckillService.java

@@ -6,7 +6,7 @@
import com.ruoyi.goods.controller.management.DTO.GoodsSeckillQuery;
import com.ruoyi.goods.controller.management.DTO.GoodsSeckillUpd;
import com.ruoyi.goods.controller.management.VO.GoodsSeckillVO;
import com.ruoyi.goods.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java

@@ -6,7 +6,7 @@
import com.ruoyi.goods.controller.management.DTO.GoodsSkuDTO;
import com.ruoyi.goods.controller.management.DTO.GoodsSkuQuery;
import com.ruoyi.goods.controller.management.VO.GoodsSkuVO;
import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java

@@ -12,13 +12,13 @@
import com.ruoyi.goods.controller.management.DTO.GoodsSeckillQuery;
import com.ruoyi.goods.controller.management.DTO.GoodsSeckillUpd;
import com.ruoyi.goods.controller.management.VO.GoodsSeckillVO;
import com.ruoyi.goods.domain.GoodsSeckill;
import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java

@@ -17,13 +17,13 @@
import com.ruoyi.goods.controller.management.VO.GoodsSkuVO;
import com.ruoyi.goods.domain.GoodsGroupPurchase;
import com.ruoyi.goods.domain.GoodsInfoTitleValue;
import com.ruoyi.goods.domain.GoodsSeckill;
import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.goods.mapper.GoodsSkuMapper;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.goods.service.IGoodsInfoTitleValueService;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import java.util.List;
import java.util.Objects;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java

@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.ruoyi.member.domain.pojo.MemberCollection;
import com.ruoyi.member.dto.MemberAddressDTO;
import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -71,7 +71,7 @@
    @PostMapping("/getMemberAddressList")
    @ResponseBody
    @ApiOperation(value = "获取用户地址")
    public R<List<MemberAddress>> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
    public R<PageDTO<MemberAddress>> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
        return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
    }


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java

@@ -2,7 +2,7 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.Member;
import com.ruoyi.member.service.IMemberService;
import io.swagger.annotations.ApiOperation;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java

@@ -2,11 +2,11 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.MemberPoints;
import com.ruoyi.member.service.IMemberPointsService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,7 +31,7 @@
    @RequestMapping("/getMemberPoints")
    @ResponseBody
    @ApiOperation(value = "获取用户积分")
    public R<List<MemberPoints>> getMemberPoints(MemberDTO memberDTO) {
    public R<PageDTO<MemberPoints>> getMemberPoints(MemberDTO memberDTO) {
        return R.ok(iMemberPointsService.getMemberPoints(memberDTO));
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberAddress.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberAddressDTO.java
@@ -1,11 +1,12 @@
package com.ruoyi.member.DTO;
package com.ruoyi.member.dto;

import com.baomidou.mybatisplus.annotation.TableLogic;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class MemberAddressDTO {
public class MemberAddressDTO extends BasePage {

    @ApiModelProperty(value = "地址id")
    private Long  Id;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberDTO.java
@@ -1,11 +1,12 @@
package com.ruoyi.member.DTO;
package com.ruoyi.member.dto;

import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class MemberDTO {
public class MemberDTO extends BasePage {
    @ApiModelProperty(value = "会员id")
    private Long memberid;
    @ApiModelProperty(value = "1是支付寶，2是微信")

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberAddressMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.member.mapper;

import com.ruoyi.member.domain.pojo.MemberAddress;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.MemberAddress;

/**
 * <p>

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java

@@ -1,10 +1,9 @@
package com.ruoyi.member.service;

import com.ruoyi.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.dto.MemberAddressDTO;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import com.ruoyi.system.api.domain.MemberAddress;

/**
 * <p>
@@ -15,7 +14,7 @@
 * @since 2024-05-16
 */
public interface IMemberAddressService extends IService<MemberAddress> {
    List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO);
    PageDTO<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO);

    void addMemberAddress(MemberAddressDTO memberAddressDTO);


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java

@@ -1,7 +1,8 @@
package com.ruoyi.member.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.MemberPoints;

import java.util.List;
@@ -16,6 +17,6 @@
 */
public interface IMemberPointsService extends IService<MemberPoints> {

    List<MemberPoints> getMemberPoints(MemberDTO memberDTO);
    PageDTO<MemberPoints> getMemberPoints(MemberDTO memberDTO);

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java

@@ -1,6 +1,6 @@
package com.ruoyi.member.service;

import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.Member;
import com.baomidou.mybatisplus.extension.service.IService;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java

@@ -2,15 +2,16 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.dto.MemberAddressDTO;
import com.ruoyi.member.mapper.MemberAddressMapper;
import com.ruoyi.member.service.IMemberAddressService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.MemberAddress;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -25,12 +26,14 @@
    @Resource
    private  IMemberAddressService iMemberAddressService;
    @Override
    public List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
    public PageDTO<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
        Page<MemberAddress> page = new Page<>(memberAddressDTO.getPageCurr(), memberAddressDTO.getPageSize());
        LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
        wrapper.eq(MemberAddress::getDelFlag,0);
        wrapper.orderByDesc(MemberAddress::getIsDefault);
        return iMemberAddressService.list(wrapper);
        Page<MemberAddress> page1 = iMemberAddressService.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java

@@ -1,14 +1,17 @@
package com.ruoyi.member.service.impl;

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.member.DTO.MemberDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.MemberPoints;
import com.ruoyi.member.mapper.MemberPointsMapper;
import com.ruoyi.member.service.IMemberPointsService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -24,7 +27,11 @@
    @Resource
    private IMemberPointsService iMemberPointsService;
    @Override
    public List<MemberPoints> getMemberPoints(MemberDTO memberDTO) {
        return iMemberPointsService.list();
    public PageDTO<MemberPoints> getMemberPoints(MemberDTO memberDTO) {
        Page<MemberPoints> page = new Page<>(memberDTO.getPageCurr(), memberDTO.getPageSize());
        LambdaQueryWrapper<MemberPoints> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberPoints::getMemberId,memberDTO.getMemberid());
        Page<MemberPoints> page1 = iMemberPointsService.page(page, wrapper);
        return PageDTO.of(page1);
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java

@@ -8,8 +8,7 @@
import org.apache.commons.io.IOUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.Member;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberService;

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java

@@ -1,9 +1,10 @@
package com.ruoyi.order.controller;


import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.service.IMemberInvoiceService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -31,10 +33,19 @@

    @PostMapping("/saveMemberInvoice")
    @ResponseBody
    @ApiOperation(value = "添加编辑用户发票抬头")
    @ApiOperation(value = "用户添加发票")
    public R<T> saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
        iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
        return R.ok();
    }

    @PostMapping("/getMemberInvoiceList")
    @ResponseBody
    @ApiOperation(value = "获取用户开票历史")
    public R<PageDTO<MemberInvoice>> getMemberInvoiceList(MemberInvoiceDTO memberInvoiceDTO) {
        return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO));
    }



}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java

@@ -1,9 +1,23 @@
package com.ruoyi.order.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,4 +31,12 @@
@RequestMapping("/member-invoice-order")
public class MemberInvoiceOrderController {

    @Resource
    private IMemberInvoiceOrderService iMemberInvoiceOrderService;
    @PostMapping("/getMemberInvoiceInfo")
    @ResponseBody
    @ApiOperation(value = "获取用户开票历史详情")
    public R<PageDTO<MemberInvoiceOrder>> getMemberInvoiceInfo(MemberInvoiceDTO memberInvoiceDTO) {
        return R.ok(iMemberInvoiceOrderService.getMemberInvoiceInfo(memberInvoiceDTO));
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java

@@ -2,7 +2,8 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
@@ -39,7 +40,7 @@
    @PostMapping("/getMemberInvoiceRiseList")
    @ResponseBody
    @ApiOperation(value = "获取用户发票抬头")
    public R<List<MemberInvoiceRise>> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public R<PageDTO<MemberInvoiceRise>> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseList(memberInvoiceRiseDTO));
    }

@@ -84,7 +85,7 @@
    @PostMapping("/getOrderList")
    @ResponseBody
    @ApiOperation(value = "获取用户已开票和未开票列表")
    public R<List<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public R<PageDTO<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getOrderList(memberInvoiceRiseDTO));
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java

@@ -2,11 +2,8 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.domain.pojo.OrderAuctionBond;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import io.swagger.annotations.ApiModelProperty;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

@@ -29,7 +26,6 @@

    /**
     * 获取当前商品信息
     *这些还要掉退款，但是还没有支付或者微信
     *
     */
    @PostMapping("/getOrderAuctionBond")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.controller.dto;
package com.ruoyi.order.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -7,7 +8,9 @@
import java.util.List;

@Data
public class MemberInvoiceDTO {
public class MemberInvoiceDTO extends BasePage {
    @ApiModelProperty(value = "数据id")
    private Integer id;
    @ApiModelProperty(value = "发票金额")
    private BigDecimal invoiceMoney;


 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceRiseDTO.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java
@@ -1,16 +1,17 @@
package com.ruoyi.order.controller.dto;
package com.ruoyi.order.dto;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

@Data
public class MemberInvoiceRiseDTO {
public class MemberInvoiceRiseDTO extends BasePage {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;


 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceOrderService.java

@@ -1,7 +1,11 @@
package com.ruoyi.order.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.dto.MemberInvoiceDTO;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,6 @@
 */
public interface IMemberInvoiceOrderService extends IService<MemberInvoiceOrder> {

    PageDTO<MemberInvoiceOrder> getMemberInvoiceInfo(MemberInvoiceDTO memberInvoiceDTO);

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java

@@ -1,7 +1,7 @@
package com.ruoyi.order.service;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.pojo.Order;
@@ -18,7 +18,7 @@
 */
public interface IMemberInvoiceRiseService extends IService<MemberInvoiceRise> {

  List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);

  void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO);

@@ -30,6 +30,6 @@

  MemberInvoiceRise getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO);

  List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java

@@ -1,8 +1,11 @@
package com.ruoyi.order.service;

import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -14,4 +17,7 @@
 */
public interface IMemberInvoiceService extends IService<MemberInvoice> {
   void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO);

   PageDTO<MemberInvoice> getMemberInvoiceList(MemberInvoiceDTO memberInvoiceDTO);

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java

@@ -1,10 +1,19 @@
package com.ruoyi.order.service.impl;

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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceOrderMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +25,14 @@
 */
@Service
public class MemberInvoiceOrderServiceImpl extends ServiceImpl<MemberInvoiceOrderMapper, MemberInvoiceOrder> implements IMemberInvoiceOrderService {

    @Resource
    private IMemberInvoiceOrderService iMemberInvoiceOrderService;
    @Override
    public PageDTO<MemberInvoiceOrder> getMemberInvoiceInfo(MemberInvoiceDTO memberInvoiceDTO) {
        Page<MemberInvoiceOrder> page = new Page<>(memberInvoiceDTO.getPageCurr(), memberInvoiceDTO.getPageSize());
        LambdaQueryWrapper<MemberInvoiceOrder> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceOrder::getInvoiceId, memberInvoiceDTO.getId());
        Page<MemberInvoiceOrder> page1 = iMemberInvoiceOrderService.page(page, wrapper);
        return PageDTO.of(page1);
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java

@@ -2,7 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
@@ -33,12 +36,14 @@
    private IOrderService iOrderService;

    @Override
    public List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        Page<MemberInvoiceRise> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
        return  iMemberInvoiceRiseService.list(wrapper);
        Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override
@@ -105,7 +110,8 @@
    }

    @Override
    public List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
    public PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        Page<Order> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(Order::getOrderStatus,4);
@@ -120,7 +126,9 @@
            list.add(4);
            wrapper.in(Order::getInvoiceStatus,list);
        }
        return iOrderService.list(wrapper);
        Page<Order> page1 = iOrderService.page(page, wrapper);
        return PageDTO.of(page1);

    }



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java

@@ -1,14 +1,19 @@
package com.ruoyi.order.service.impl;

import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.Order;
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.*;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -29,10 +34,19 @@
    private IMemberInvoiceService iMemberInvoiceService;

    @Resource
    private IMemberInvoiceOrderService IMemberInvoiceOrderService;
    private IMemberInvoiceOrderService iMemberInvoiceOrderService;

    @Resource
    private IOrderMallService iOrderMallService;

    @Resource
    private IOrderService iOrderService;

    @Resource
    private GoodsSkuClient goodsSkuClient;

    @Resource
    private IOrderAuctionService iOrderAuctionService;

    @Override
    public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
@@ -58,8 +72,39 @@
           memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
           memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
           memberInvoiceOrder1.setOrderNo(order.getOrderNo());
           memberInvoiceOrder1.setOrderName("");

           String OrderName="";
           if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
               LambdaQueryWrapper<OrderMall> wrapper = Wrappers.lambdaQuery();
               wrapper.eq(OrderMall::getOrderId, order.getId());
               wrapper.eq(OrderMall::getDelFlag, 0);
               OrderMall orderMall= iOrderMallService.getOne(wrapper);
               R<GoodsSku> goodsSkuR=goodsSkuClient.getGoodsSkuOne(orderMall.getGoodsSkuId());
               GoodsSku goodsSku=goodsSkuR.getData();
               OrderName=goodsSku.getSkuName();
           }else{
               LambdaQueryWrapper<OrderAuction> wrapper = Wrappers.lambdaQuery();
               wrapper.eq(OrderAuction::getOrderId, order.getId());
               wrapper.eq(OrderAuction::getDelFlag, 0);
               OrderAuction orderAuction=iOrderAuctionService.getOne(wrapper);
               R<GoodsSeckill> goodsSeckillR=goodsSkuClient.getGoodsSeckillOne(orderAuction.getSalesroomGoodsId());
               GoodsSeckill goodsSeckill=goodsSeckillR.getData();
               R<GoodsSku> goodsSkuR=goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId());
               GoodsSku goodsSku=goodsSkuR.getData();
               OrderName=goodsSku.getSkuName();
       }
           memberInvoiceOrder1.setOrderName(OrderName);
           iMemberInvoiceOrderService.save(memberInvoiceOrder1);
       }
    }

    @Override
    public PageDTO<MemberInvoice> getMemberInvoiceList(MemberInvoiceDTO memberInvoiceDTO) {
        Page<MemberInvoice> page = new Page<>(memberInvoiceDTO.getPageCurr(), memberInvoiceDTO.getPageSize());
        LambdaQueryWrapper<MemberInvoice> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoice::getMemberId, memberInvoiceDTO.getMemberId());
        wrapper.eq(MemberInvoice::getDelFlag, 0);
        wrapper.orderByDesc(MemberInvoice::getCreateTime);
        Page<MemberInvoice> page1 = iMemberInvoiceService.page(page, wrapper);
        return PageDTO.of(page1);
    }
}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java

@@ -2,6 +2,7 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.service.ICouponMemberService;
@@ -33,7 +34,7 @@
    @PostMapping("/getCouponMemberList")
    @ResponseBody
    @ApiOperation(value = "获取用户优惠卷")
    public R<List<CouponMember>> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
    public R<PageDTO<CouponMember>> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
        return R.ok(iCouponMemberService.getCouponMemberList(couponMemberDTO));
    }


 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java

@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.ruoyi.promotion.service.IPromotionVideoService;
import java.util.List;
import javax.annotation.Resource;

import com.ruoyi.system.api.domain.PromotionVideo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java

@@ -2,6 +2,7 @@


import com.ruoyi.common.core.domain.R;
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;
@@ -33,7 +34,7 @@
    @RequestMapping("/getPromotionWishList")
    @ResponseBody
    @ApiOperation(value = "获取心愿单列表")
    public R<List<PromotionWishList>> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {
    public R<PageDTO<PromotionWishList>> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {
        return R.ok(iPromotionWishListService.getPromotionWishList(promotionWishListDTO));
    }


 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java

@@ -1,10 +1,11 @@
package com.ruoyi.promotion.controller.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class CouponMemberDTO {
public class CouponMemberDTO extends BasePage {
    @ApiModelProperty(value = "会员id")
    private  Long memberId;


 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
@@ -9,7 +10,7 @@
import java.math.BigDecimal;

@Data
public class PromotionWishListDTO {
public class PromotionWishListDTO extends BasePage {
    @ApiModelProperty(value = "心愿求购id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long romotionWishId;

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionVideo.java

File was deleted

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionVideoMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.promotion.mapper;

import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.PromotionVideo;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java

@@ -1,5 +1,6 @@
package com.ruoyi.promotion.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,6 @@
 */
public interface ICouponMemberService extends IService<CouponMember> {

    List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);
    PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionVideoService.java

@@ -1,7 +1,7 @@
package com.ruoyi.promotion.service;

import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.PromotionVideo;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java

@@ -1,5 +1,6 @@
package com.ruoyi.promotion.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,7 +17,7 @@
 */
public interface IPromotionWishListService extends IService<PromotionWishList> {

    List<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO);
    PageDTO<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO);
    PromotionWishList getPromotionWishOne(PromotionWishListDTO promotionWishListDTO);
    void savePromotionWishList(PromotionWishListDTO promotionWishListDTO);


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

@@ -2,12 +2,15 @@

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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.MemberAddress;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -28,7 +31,7 @@
    @Resource
    private ICouponMemberService iCouponMemberService;
    @Override
    public List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
    public PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
        LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(CouponMember::getCouponStatus,1);
        wrapper.eq(CouponMember::getDelFlag,0);
@@ -39,9 +42,11 @@
                iCouponMemberService.updateById(couponMember);
            }
        }
        Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize());
        LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(CouponMember::getCouponStatus,couponMemberDTO.getCouponStatus());
        wrapper1.eq(CouponMember::getDelFlag,0);
        return iCouponMemberService.list(wrapper1);
        Page<CouponMember> page1 = iCouponMemberService.page(page, wrapper);
        return PageDTO.of(page1);
    }
}

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

@@ -1,9 +1,9 @@
package com.ruoyi.promotion.service.impl;

import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.ruoyi.promotion.mapper.PromotionVideoMapper;
import com.ruoyi.promotion.service.IPromotionVideoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.PromotionVideo;
import org.springframework.stereotype.Service;

/**

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

@@ -2,7 +2,10 @@

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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
@@ -31,10 +34,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