Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
80ed7bf4
Commit
80ed7bf4
authored
Aug 14, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户端兑换记录添加图片,单次兑换礼品积分
parent
5097f231
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
1 deletion
+15
-1
AppRedeemRewardController.java
...ward/controller/app/redeem/AppRedeemRewardController.java
+0
-1
AppRewardRedeemDetailRespVO.java
...controller/app/redeem/vo/AppRewardRedeemDetailRespVO.java
+6
-0
RewardRedeemPageRespVO.java
...yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
+6
-0
RewardRedeemMapper.xml
...ard-impl/src/main/resources/mapper/RewardRedeemMapper.xml
+3
-0
No files found.
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/AppRedeemRewardController.java
View file @
80ed7bf4
...
@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
...
@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import
cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent
;
import
cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent
;
import
cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog
;
import
cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog
;
import
cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi
;
import
cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi
;
import
cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO
;
import
cn.iocoder.yudao.module.reward.controller.app.redeem.vo.*
;
import
cn.iocoder.yudao.module.reward.controller.app.redeem.vo.*
;
import
cn.iocoder.yudao.module.reward.service.redeem.RewardRedeemService
;
import
cn.iocoder.yudao.module.reward.service.redeem.RewardRedeemService
;
import
cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO
;
import
cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO
;
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/vo/AppRewardRedeemDetailRespVO.java
View file @
80ed7bf4
...
@@ -32,6 +32,12 @@ public class AppRewardRedeemDetailRespVO {
...
@@ -32,6 +32,12 @@ public class AppRewardRedeemDetailRespVO {
private
Date
startTime
;
private
Date
startTime
;
@ApiModelProperty
(
value
=
"活动结束日期"
)
@ApiModelProperty
(
value
=
"活动结束日期"
)
private
Date
endTime
;
private
Date
endTime
;
@ApiModelProperty
(
value
=
"中文礼品图片"
)
private
String
imgZh
;
@ApiModelProperty
(
value
=
"英文礼品图片"
)
private
String
imgEn
;
@ApiModelProperty
(
value
=
"礼品单次兑换所需积分"
)
private
Integer
oncePointsRequire
;
@ApiModelProperty
(
value
=
"兑换方式"
)
@ApiModelProperty
(
value
=
"兑换方式"
)
private
Integer
redeemType
;
private
Integer
redeemType
;
@ApiModelProperty
(
value
=
"兑换网点(中文)"
)
@ApiModelProperty
(
value
=
"兑换网点(中文)"
)
...
...
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java
View file @
80ed7bf4
...
@@ -47,4 +47,10 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
...
@@ -47,4 +47,10 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
private
Date
startTime
;
private
Date
startTime
;
@ApiModelProperty
(
value
=
"活动结束日期"
)
@ApiModelProperty
(
value
=
"活动结束日期"
)
private
Date
endTime
;
private
Date
endTime
;
@ApiModelProperty
(
value
=
"中文礼品图片"
)
private
String
imgZh
;
@ApiModelProperty
(
value
=
"英文礼品图片"
)
private
String
imgEn
;
@ApiModelProperty
(
value
=
"礼品单次兑换所需积分"
)
private
Integer
oncePointsRequire
;
}
}
yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml
View file @
80ed7bf4
...
@@ -43,6 +43,9 @@
...
@@ -43,6 +43,9 @@
er.points_require as pointsRequire,
er.points_require as pointsRequire,
er.start_time as startTime,
er.start_time as startTime,
er.end_time as endTime,
er.end_time as endTime,
er.img_zh as imgZh,
er.img_en as imgEn,
er.points_require as oncePointsRequire,
<include
refid=
"columns"
/>
<include
refid=
"columns"
/>
from ecw_reward_redeem err
from ecw_reward_redeem err
left join ecw_reward er on err.reward_id = er.id
left join ecw_reward er on err.reward_id = er.id
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment