From d8e55d90211ce3bbc39dddb80c4f1a05f50f5414 Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Sat, 29 Mar 2025 15:52:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(myInvitation):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=87=91=E5=B8=81=E6=94=B6=E5=85=A5=E8=AE=B0=E5=BD=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonalCenterController.java | 13 +++++++ .../mcwl/myInvitation/domain/Commission.java | 3 ++ .../com/mcwl/myInvitation/domain/Consume.java | 3 ++ .../myInvitation/domain/vo/CommissionVo.java | 39 +++++++++++++++++++ .../myInvitation/domain/vo/ConsumeVo.java | 6 +++ .../service/CommissionService.java | 5 +++ .../service/impl/CommissionServiceImpl.java | 29 ++++++++++++++ .../service/impl/OrderTradeServiceImpl.java | 6 +++ 8 files changed, 104 insertions(+) create mode 100644 mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/CommissionVo.java diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/personalCenter/PersonalCenterController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/personalCenter/PersonalCenterController.java index b906be4..497432d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/personalCenter/PersonalCenterController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/personalCenter/PersonalCenterController.java @@ -12,6 +12,7 @@ import com.mcwl.memberCenter.domain.MemberConsume; import com.mcwl.memberCenter.domain.vo.MemberConsumeVO; import com.mcwl.memberCenter.domain.vo.RechargeRecordVO; import com.mcwl.memberCenter.service.MemberService; +import com.mcwl.myInvitation.service.CommissionService; import com.mcwl.myInvitation.service.ConsumeService; import com.mcwl.pay.service.OrderTradeService; import com.mcwl.resource.domain.dto.ModelImagePageRes; @@ -54,6 +55,8 @@ public class PersonalCenterController { private final ConsumeService consumeService; + private final CommissionService commissionService; + /** * 我的发布-模型列表 @@ -150,6 +153,16 @@ public class PersonalCenterController { return consumeService.getWalletRecord(pageDomain); } + /** + * 获取金币收入记录 + */ + @ApiOperation(value = "获取金币收入记录") + @PostMapping("/getWalletIncomeRecord") + public TableDataInfo getWalletIncomeRecord(@Valid @RequestBody PageDomain pageDomain) { + + return commissionService.getWalletIncomeRecord(pageDomain); + } + /** * 获取金币充值记录 */ diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java index 3543c6e..dc54361 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java @@ -24,4 +24,7 @@ public class Commission extends BaseEntity { // 提成金额 private Double amount; + + // 剩余金币 + private Double wallet; } diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java index be0ec28..e91808d 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java @@ -32,6 +32,9 @@ public class Consume extends BaseEntity { // 商品类型 0模型 1工作流 2图片 private Integer type; + // 剩余金币 + private Double wallet; + // 消费时间 private Date consumeDate; } diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/CommissionVo.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/CommissionVo.java new file mode 100644 index 0000000..b2c6a1b --- /dev/null +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/CommissionVo.java @@ -0,0 +1,39 @@ +package com.mcwl.myInvitation.domain.vo; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 金币收入返回对象 + */ +@Data +@ApiModel(description = "金币收入") +public class CommissionVo { + + /** + * 收入金币 + */ + @ApiModelProperty("收入金币") + private Double amount; + + /** + * 剩余金币 + */ + @ApiModelProperty("剩余金币") + private Double wallet; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + +} diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java index e68400a..70c3f1c 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java @@ -31,6 +31,12 @@ public class ConsumeVo { @ApiModelProperty(value = "商品名称") private String productName; + /** + * 剩余金币 + */ + @ApiModelProperty(value = "剩余金币") + private Double wallet; + // 消费时间 @ApiModelProperty(value = "消费时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/CommissionService.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/CommissionService.java index fb41594..6417e4f 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/CommissionService.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/CommissionService.java @@ -1,8 +1,13 @@ package com.mcwl.myInvitation.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.mcwl.common.core.page.PageDomain; +import com.mcwl.common.core.page.TableDataInfo; import com.mcwl.myInvitation.domain.Commission; +import javax.validation.Valid; + public interface CommissionService extends IService { + TableDataInfo getWalletIncomeRecord(PageDomain pageDomain); } diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionServiceImpl.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionServiceImpl.java index 8590de7..3a972f0 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionServiceImpl.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionServiceImpl.java @@ -1,16 +1,45 @@ package com.mcwl.myInvitation.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mcwl.common.constant.HttpStatus; +import com.mcwl.common.core.page.PageDomain; +import com.mcwl.common.core.page.TableDataInfo; +import com.mcwl.common.utils.SecurityUtils; import com.mcwl.myInvitation.domain.Commission; +import com.mcwl.myInvitation.domain.vo.CommissionVo; import com.mcwl.myInvitation.mapper.CommissionMapper; import com.mcwl.myInvitation.service.CommissionService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor public class CommissionServiceImpl extends ServiceImpl implements CommissionService { + @Override + public TableDataInfo getWalletIncomeRecord(PageDomain pageDomain) { + + Page page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); + + baseMapper.selectPage(page, new LambdaQueryWrapper() + .eq(Commission::getUserId, SecurityUtils.getUserId())); + + List commissionList = page.getRecords(); + List commissionVoList = BeanUtil.copyToList(commissionList, CommissionVo.class); + + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(commissionVoList); + rspData.setTotal(page.getTotal()); + return rspData; + } } diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java index ab3db33..0544e58 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java @@ -154,6 +154,7 @@ public class OrderTradeServiceImpl extends ServiceImpl