From 930658f087df885f01cefbba30856303e0528c58 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:06:49 +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 | 3 +
src/main/java/cc/mrbird/febs/mall/dto/ApiOrderSellDto.java | 22 +++++++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java | 2 +
src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java | 9 ++++
src/main/resources/mapper/modules/MallProductBuyMapper.xml | 8 ++++
src/main/java/cc/mrbird/febs/mall/vo/ApiOrderSellVo.java | 28 ++++++++++++++
7 files changed, 81 insertions(+), 0 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 9e96c3a..b54b8b1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallProductController.java
@@ -149,4 +149,13 @@
return iApiMallProductService.orderBuyList(apiOrderBuyDto);
}
+ @ApiOperation(value = "FCM-提现列表", notes = "FCM-提现列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiOrderSellVo.class)
+ })
+ @PostMapping(value = "/orderSellList")
+ public FebsResponse orderSellList(@RequestBody @Valid ApiOrderSellDto apiOrderBuyDto) {
+ return iApiMallProductService.orderSellList(apiOrderBuyDto);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderSellDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderSellDto.java
new file mode 100644
index 0000000..59c11a9
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiOrderSellDto.java
@@ -0,0 +1,22 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiOrderSellDto", description = "参数接收类")
+public class ApiOrderSellDto {
+
+ @ApiModelProperty(value = "一页数量", example = "10")
+ private Integer pageSize;
+
+ @ApiModelProperty(value = "第几页", example = "1")
+ private Integer pageNum;
+
+ @ApiModelProperty(value = "预约状态 0：失败 1：卖出中等待买家 2：超时 3：已完成", example = "1")
+ private Integer state;
+
+ @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 7b433dd..b22b56d 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallProductBuyMapper.java
@@ -2,10 +2,12 @@
import cc.mrbird.febs.mall.dto.ApiOrderBuyDto;
import cc.mrbird.febs.mall.dto.ApiOrderListDto;
+import cc.mrbird.febs.mall.dto.ApiOrderSellDto;
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 cc.mrbird.febs.mall.vo.ApiOrderSellVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -28,4 +30,5 @@
Integer selectListByMemberIdAndState(@Param("memberId")Long id);
+ IPage<ApiOrderSellVo> selectSellListInPage(IPage<ApiOrderSellVo> page, @Param("record")ApiOrderSellDto 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 a2a32c2..7eacce5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallProductService.java
@@ -43,4 +43,6 @@
FebsResponse transGfd(ApiTransGfdDto transGfdDto);
FebsResponse gfdTrans(ApiGfdTransDto transGfdDto);
+
+ FebsResponse orderSellList(ApiOrderSellDto 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 0172e65..77eeabd 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
@@ -834,4 +834,13 @@
}
return new FebsResponse().success();
}
+
+ @Override
+ public FebsResponse orderSellList(ApiOrderSellDto apiOrderBuyDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ IPage<ApiOrderSellVo> page = new Page<>(apiOrderBuyDto.getPageNum(), apiOrderBuyDto.getPageSize());
+ apiOrderBuyDto.setMemberId(memberId);
+ IPage<ApiOrderSellVo> apiOrderBuyVoIPage = mallProductBuyMapper.selectSellListInPage(page, apiOrderBuyDto);
+ return new FebsResponse().success().data(apiOrderBuyVoIPage);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderSellVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderSellVo.java
new file mode 100644
index 0000000..8b52a22
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderSellVo.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiOrderSellVo", description = "信息返回类")
+public class ApiOrderSellVo {
+ @ApiModelProperty(value = "id")
+ private Long id;
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+ @ApiModelProperty(value = "动态NFT总数")
+ private BigDecimal nftTotal;//动态NFT总数
+ @ApiModelProperty(value = "实际提现数量")
+ private BigDecimal nftCnt;//实际提现数量
+ @ApiModelProperty(value = "剩余数量")
+ private BigDecimal nftCntAva;//剩余数量
+ @ApiModelProperty(value = "NFT手续费")
+ private BigDecimal nftFee;//NFT手续费
+ @ApiModelProperty(value = "代币手续费")
+ private BigDecimal fcmFee;//代币手续费
+ @ApiModelProperty(value = "预约状态 0：失败 1：卖出中等待买家 2：超时 3：已完成")
+ private Integer state;//预约状态 0：失败 1：进行中 2：超时 3：已完成
+}
diff --git a/src/main/resources/mapper/modules/MallProductBuyMapper.xml b/src/main/resources/mapper/modules/MallProductBuyMapper.xml
index c5af12d..7fae45d 100644
--- a/src/main/resources/mapper/modules/MallProductBuyMapper.xml
+++ b/src/main/resources/mapper/modules/MallProductBuyMapper.xml
@@ -55,4 +55,12 @@
where a.member_id = #{memberId}
</select>
+ <select id="selectSellListInPage" resultType="cc.mrbird.febs.mall.vo.ApiOrderSellVo">
+ select a.*
+ from mall_product_sell a
+ where a.state = #{record.state}
+ and a.member_id = #{record.memberId}
+ order by a.CREATED_TIME desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1