From 752f0a5d7a58bb73f569720b708696602a81debe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Sep 2022 15:25:22 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml | 2 ++
src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java | 7 ++++++-
src/main/java/cc/mrbird/febs/mall/entity/MallLeaderAchieve.java | 3 +++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderAchieve.java b/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderAchieve.java
index 99babd2..58c53d4 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderAchieve.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallLeaderAchieve.java
@@ -32,4 +32,7 @@
@TableField(exist = false)
private String goodsName;
+ @TableField(exist = false)
+ private String nickname;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
index 53d0928..b069962 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,10 +28,14 @@
@ApiModelProperty(value = "1：未提成 2：已提成")
private Integer state;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private Date createdTime;
@ApiModelProperty(value = "产品名称")
- private String goodsName;;
+ private String goodsName;
+
+ @ApiModelProperty(value = "下单人昵称")
+ private String nickname;
}
diff --git a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
index 6d6155c..f20fd14 100644
--- a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
+++ b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
@@ -40,8 +40,10 @@
<select id="selectApiLeaderProfitListInPage" resultType="cc.mrbird.febs.mall.entity.MallLeaderAchieve">
select a.*,
+ b.name nickname,
c.goods_name goodsName
from mall_leader_achieve a
+ inner join mall_member b on a.member_id = b.id
inner join mall_order_item c on a.order_item_id = c.id
<where>
a.state = 2
--
Gitblit v1.9.1