From c9e904c9533944c491d348e2a35c78bddc28db4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 24 五月 2024 17:05:31 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSeckillController.java | 12
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java | 20 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceRiseDTO.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeckillService.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 65 ++++++-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 26 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 3
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 3
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceOrderService.java | 6
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionVideoMapper.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSkuMapper.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java | 22 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java | 15 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java | 7
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java | 3
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java | 3
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java | 5
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java | 9 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java | 3
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java | 5
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java | 13
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java | 3
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java | 17 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionVideoService.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 9
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 10
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeckill.java | 16 -
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java | 9
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeckillMapper.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberAddressMapper.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java | 3
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java | 3
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 18 +
/dev/null | 65 -------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java | 8
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java | 6
59 files changed, 302 insertions(+), 196 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java
index c113e83..96c8b08 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeckill.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeckill.java
similarity index 87%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeckill.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeckill.java
index 602a7f3..77afc1b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeckill.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/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>
* 商品秒杀表
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java
index 37bd114..5cd8685 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java
+++ b/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)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
index bef22dd..60f9b62 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
+++ b/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;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
index 3ef7909..f2f6fc5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
+++ b/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());
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
index 3524d71..fdc2e7c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
+++ b/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
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
index 6913caa..bdcf448 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
+++ b/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);
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
index c58028c..ef5c719 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
+++ b/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;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java
index 2587503..7f5eb26 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index ce98441..6aac614 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/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));
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
index 10ebcfd..23b0365 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java
index 7bde937..0ca1668 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
index 80c76be..178b42f 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
+++ b/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);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index b421a8f..8f3b9df 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/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();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSeckillController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSeckillController.java
index ed88fb9..c72f7f3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSeckillController.java
+++ b/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);
+ }
/**
* 开始秒杀
*
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java
index df8f693..0a8761d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSku.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSku.java
deleted file mode 100644
index 7718272..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSku.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.ruoyi.goods.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.ruoyi.common.core.enums.ListingStatusEnum;
-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;
-
-/**
- * <p>
- * 商品表
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_goods_sku")
-@ApiModel(value = "GoodsSku对象", description = "商品表")
-public class GoodsSku implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "商品id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Long id;
-
- @ApiModelProperty(value = "商品名称")
- private String skuName;
-
- @ApiModelProperty(value = "商品年份")
- private String years;
-
- @ApiModelProperty(value = "商品分类id")
- private Long categoryId;
-
- @ApiModelProperty(value = "商品系列id")
- private Long seriesId;
-
- @ApiModelProperty(value = "商品品牌id")
- private Long brandId;
-
- @ApiModelProperty(value = "商品香型id")
- private Long flavorTypeId;
-
- @ApiModelProperty(value = "商品价格")
- private BigDecimal price;
-
- @ApiModelProperty(value = "库存")
- private Integer stock;
-
- @ApiModelProperty(value = "已售数量")
- private Integer soldQuantity;
-
- @ApiModelProperty(value = "单位")
- private String unit;
-
- @ApiModelProperty(value = "规格")
- private String spec;
-
- @ApiModelProperty(value = "规格单位")
- private String specUnit;
-
- @ApiModelProperty(value = "封面图")
- private String coverPic;
-
- @ApiModelProperty(value = "详情图，不超过五张图片")
- private String album;
-
- @ApiModelProperty(value = "分享标题")
- private String shareTitle;
-
- @ApiModelProperty(value = "分享图片")
- private String sharePic;
-
- @ApiModelProperty(value = "商品描述")
- private String description;
-
- @ApiModelProperty(value = "商品说明")
- private String detail;
-
- @ApiModelProperty(value = "排序")
- private Integer sortNum;
-
- @ApiModelProperty(value = "上架状态 0=上架中 1= 已下架")
- private ListingStatusEnum listingStatus;
-
- @ApiModelProperty(value = "创建者")
- @TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
- @TableLogic
- private Integer delFlag;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeckillMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeckillMapper.java
index 4610b63..6a7fab4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeckillMapper.java
+++ b/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;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSkuMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSkuMapper.java
index 009bda9..ec1dfbd 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSkuMapper.java
+++ b/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>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeckillService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeckillService.java
index 95d6508..b9c4f5f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeckillService.java
+++ b/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;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
index b14f61a..7758639 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
+++ b/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;
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
index 6c21b7c..b41c374 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index 2627617..d544f11 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
index ea08a92..b0f8bba 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
+++ b/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));
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
index 78b708c..6ad15d4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
index 7e68638..d1f11ac 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
+++ b/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));
}
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberAddress.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberAddress.java
deleted file mode 100644
index 0b7162e..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberAddress.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.member.domain.pojo;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 会员地址表
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_member_address")
-@ApiModel(value = "MemberAddress对象", description = "会员地址表")
-public class MemberAddress implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "会员地址id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Long id;
-
- @ApiModelProperty(value = "会员id")
- private Long memberId;
-
- @ApiModelProperty(value = "收件人姓名")
- private String recipientName;
-
- @ApiModelProperty(value = "收件人电话")
- private String recipientPhone;
-
- @ApiModelProperty(value = "城市 省市区")
- private String city;
-
- @ApiModelProperty(value = "详细地址")
- private String detailedAddress;
-
- @ApiModelProperty(value = "创建者")
- @TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
- @TableLogic
- private Integer delFlag;
-
- @ApiModelProperty(value = "是否默认")
- @TableLogic
- private Integer isDefault;
-
- @ApiModelProperty(value = "省份/直辖市")
- private String receiverProvince;
-
- @ApiModelProperty(value = "省")
- private String receiverCity;
-
- @ApiModelProperty(value = "区")
- private String receiverRegion;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberAddressDTO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java
similarity index 86%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberAddressDTO.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java
index 0cd3125..cc90814 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberAddressDTO.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberDTO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java
similarity index 87%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberDTO.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java
index 480a423..28f8802 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberDTO.java
+++ b/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是微信")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberAddressMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberAddressMapper.java
index 324373e..e5f5541 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberAddressMapper.java
+++ b/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>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
index 2f267e9..fc5c21c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
+++ b/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);
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
index 425c60b..a5bb1d6 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
+++ b/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);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
index 37b3dd9..56c4780 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
index ac3324b..d92c36b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
+++ b/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
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
index d27b620..cfb31bc 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
+++ b/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);
}
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 94d3be4..4ae784e 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
index 5c628b0..9031034 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
+++ b/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));
+ }
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
index 3637751..589ff75 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
+++ b/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));
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
index 0c0047c..7f49d5d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
+++ b/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));
}
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
index 76aa20c..a931e91 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
+++ b/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")
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java
similarity index 86%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java
index b32fccf..d5f0fc5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/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;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceRiseDTO.java
similarity index 91%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceRiseDTO.java
index 54575f5..20ee93d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/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;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceOrderService.java
index 1eaa677..db81283 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceOrderService.java
+++ b/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);
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
index 6663803..88d4097 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
+++ b/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);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
index 22f3630..97ece7e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
+++ b/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);
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
index 1991492..d8aa76a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
+++ b/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);
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
index 16765b6..7e330b0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
+++ b/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);
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index 1d0a775..83dec48 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/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);
+ }
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
index 50edc05..c2d7bc5 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
+++ b/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));
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
index f439f56..9a97451 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
index d532348..9155fb1 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
+++ b/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));
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
index 1419fd0..b966f3c 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java
index 9c0ab6f..bc215aa 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionVideo.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionVideo.java
deleted file mode 100644
index 5a27c1b..0000000
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionVideo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ruoyi.promotion.domain.pojo;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 视频表
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_promotion_video")
-@ApiModel(value = "PromotionVideo对象", description = "视频表")
-public class PromotionVideo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "视频id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Long id;
-
- @ApiModelProperty(value = "视频名称")
- private String videoName;
-
- @ApiModelProperty(value = "视频链接")
- private String videoUrl;
-
- @ApiModelProperty(value = "创建者")
- @TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
- @TableLogic
- private Integer delFlag;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionVideoMapper.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionVideoMapper.java
index 16a78de..3b283c1 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionVideoMapper.java
+++ b/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>
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index 141037c..2b3555f 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/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);
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionVideoService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionVideoService.java
index 217cda1..adddfd5 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionVideoService.java
+++ b/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>
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
index 1854f9a..0cac397 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
+++ b/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);
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index c12eec3..a0ef57a 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/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);
}
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java
index 1b21f6a..52fa5b9 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java
+++ b/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;
/**
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
index 4956b8f..005b2d3 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
+++ b/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
--
Gitblit v1.7.1