From 0b4ddcc6cd1b3ca9973ba4bf1732be010a7de4e2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 07 Dec 2021 14:33:34 +0800
Subject: [PATCH] 20211207 fish
---
src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java | 1 -
src/main/resources/mapper/fish/CannonOwnRecordDao.xml | 2 ++
src/main/java/com/xcong/excoin/modules/fish/vo/AwardVo.java | 3 +++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
index c049297..c26364d 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
@@ -380,7 +380,6 @@
public static void main(String[] args) {
- System.out.println(UUID.randomUUID().toString());
}
diff --git a/src/main/java/com/xcong/excoin/modules/fish/vo/AwardVo.java b/src/main/java/com/xcong/excoin/modules/fish/vo/AwardVo.java
index 29be936..7858e55 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/vo/AwardVo.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/vo/AwardVo.java
@@ -11,4 +11,7 @@
@ApiModelProperty(value = "奖品名称")
private String name;
+ @ApiModelProperty(value = "奖品数量")
+ private Integer quantity;
+
}
diff --git a/src/main/resources/mapper/fish/CannonOwnRecordDao.xml b/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
index 465b3f0..7ed9e17 100644
--- a/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
+++ b/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
@@ -23,12 +23,14 @@
<result property="consume" column="consume" />
<collection property="awardVo" ofType="com.xcong.excoin.modules.fish.vo.AwardVo" >
<result property="name" column="name" />
+ <result property="quantity" column="quantity" />
</collection>
</resultMap>
<select id="getAwards" resultMap="awardsMap">
select
a.consume,
+ b.quantity,
b.name
from cannon_award_set a
inner join cannon_award b on a.code = b.activity_code
--
Gitblit v1.9.1