From 4c7c790d34fcadf0d634cbdfc274bfff3891eedc Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 30 Nov 2023 10:10:48 +0800 Subject: [PATCH] 预约列表 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 9 ++++ src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java | 4 ++ src/main/java/cc/mrbird/febs/mall/dto/ApiOrderBuyDto.java | 19 +++++++++ src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java | 2 + src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java | 14 +++++-- src/main/java/cc/mrbird/febs/mall/vo/ApiOrderBuyVo.java | 22 +++++++++++ src/main/resources/mapper/modules/MallProductBuyMapper.xml | 8 ++++ 7 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java index c130756..b9a57f1 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java @@ -3,10 +3,7 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.service.IApiMallProductService; -import cc.mrbird.febs.mall.vo.ApiMallProductNftVo; -import cc.mrbird.febs.mall.vo.ApiOrderBuyInfoVo; -import cc.mrbird.febs.mall.vo.ApiOrderSellInfoVo; -import cc.mrbird.febs.mall.vo.ApiOrderListVo; +import cc.mrbird.febs.mall.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -93,4 +90,13 @@ return iApiMallProductService.outNFT(outNFTDto); } + @ApiOperation(value = "FCM-预约列表", notes = "FCM-预约列表") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = ApiOrderBuyVo.class) + }) + @PostMapping(value = "/orderBuyList") + public FebsResponse orderBuyList(@RequestBody @Valid ApiOrderBuyDto apiOrderBuyDto) { + return iApiMallProductService.orderBuyList(apiOrderBuyDto); + } + } diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderBuyDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderBuyDto.java new file mode 100644 index 0000000..d749092 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderBuyDto.java @@ -0,0 +1,19 @@ +package cc.mrbird.febs.mall.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "ApiOrderBuyDto", description = "参数接收类") +public class ApiOrderBuyDto { + + @ApiModelProperty(value = "一页数量", example = "10") + private Integer pageSize; + + @ApiModelProperty(value = "第几页", example = "1") + private Integer pageNum; + + @ApiModelProperty(hidden = true) + private Long memberId; +} diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java index 64a6f11..724bebd 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java @@ -1,8 +1,10 @@ package cc.mrbird.febs.mall.mapper; +import cc.mrbird.febs.mall.dto.ApiOrderBuyDto; import cc.mrbird.febs.mall.dto.ApiOrderListDto; import cc.mrbird.febs.mall.entity.MallProductBuy; import cc.mrbird.febs.mall.vo.ApiOrderBuyInfoVo; +import cc.mrbird.febs.mall.vo.ApiOrderBuyVo; import cc.mrbird.febs.mall.vo.ApiOrderListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,4 +23,6 @@ ApiOrderBuyInfoVo selectBuyById(@Param("id")Long productBuyId); List<MallProductBuy> selectListByStateAndProductNFTId(@Param("state")int value, @Param("nftId")Long nftId, @Param("mateState")int mateState); + + IPage<ApiOrderBuyVo> selectBuyListInPage(IPage<ApiOrderBuyVo> page, @Param("record")ApiOrderBuyDto apiOrderBuyDto); } diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java index 93e3420..8b5cd4b 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java @@ -27,4 +27,6 @@ FebsResponse orderBuyInsure(ApiOrderBuyInsureDto apiOrderBuyInsureDto); FebsResponse orderSellInsure(ApiOrderSellInsureDto apiOrderSellInsureDto); + + FebsResponse orderBuyList(ApiOrderBuyDto apiOrderBuyDto); } diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java index 842f7b9..d77b875 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java @@ -516,4 +516,13 @@ agentProducer.sendFcmOrderSellInsureMsg(sellRecordId); return new FebsResponse().success(); } + + @Override + public FebsResponse orderBuyList(ApiOrderBuyDto apiOrderBuyDto) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + IPage<ApiOrderBuyVo> page = new Page<>(apiOrderBuyDto.getPageNum(), apiOrderBuyDto.getPageSize()); + apiOrderBuyDto.setMemberId(memberId); + IPage<ApiOrderBuyVo> apiOrderBuyVoIPage = mallProductBuyMapper.selectBuyListInPage(page, apiOrderBuyDto); + return new FebsResponse().success().data(apiOrderBuyVoIPage); + } } diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderBuyVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderBuyVo.java new file mode 100644 index 0000000..c05d369 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderBuyVo.java @@ -0,0 +1,22 @@ +package cc.mrbird.febs.mall.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "ApiOrderBuyVo", description = "信息返回类") +public class ApiOrderBuyVo { + + @ApiModelProperty(value = "状态 0:失败 1:进行中 2:超时 3:已完成") + private Integer state; + @ApiModelProperty(value = "订单编号") + private String orderNo; + @ApiModelProperty(value = "数量") + private BigDecimal nftTotal; + @ApiModelProperty(value = "时间") + private Date createdTime; +} diff --git a/src/main/resources/mapper/modules/MallProductBuyMapper.xml b/src/main/resources/mapper/modules/MallProductBuyMapper.xml index 20d33f5..f30d807 100644 --- a/src/main/resources/mapper/modules/MallProductBuyMapper.xml +++ b/src/main/resources/mapper/modules/MallProductBuyMapper.xml @@ -39,4 +39,12 @@ order by a.CREATED_TIME asc </select> + <select id="selectBuyListInPage" resultType="cc.mrbird.febs.mall.vo.ApiOrderBuyVo"> + select + a.* + from mall_product_buy a + where a.member_id = #{record.memberId} + order by a.CREATED_TIME desc + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.1