Commit 3a85b187 authored by zhangfeng's avatar zhangfeng

bugfix(723): 兑换记录查询修改

parent 404928c4
...@@ -84,6 +84,9 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper, ...@@ -84,6 +84,9 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
result.forEach(respVO -> { result.forEach(respVO -> {
if (respVO.getEntrance() != PlatformTypeEnum.BACKEND.getValue()) { if (respVO.getEntrance() != PlatformTypeEnum.BACKEND.getValue()) {
respVO.setCreatorName(respVO.getMemberNameZh()); respVO.setCreatorName(respVO.getMemberNameZh());
if (respVO.getUpdateTime().equals(respVO.getCreateTime())) {
respVO.setUpdaterName(respVO.getMemberNameZh());
}
} }
}); });
int total = rewardRedeemMapper.pageCount(reqVO); int total = rewardRedeemMapper.pageCount(reqVO);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
left join ecw_reward er on err.reward_id = er.id left join ecw_reward er on err.reward_id = er.id
left join member_user mu on mu.id = err.member_id left join member_user mu on mu.id = err.member_id
left join ecw_node en on er.node_id = en.id left join ecw_node en on er.node_id = en.id
left join system_user suc on suc.id = er.creator left join system_user suc on suc.id = err.creator
left join system_user suu on suu.id = er.updater left join system_user suu on suu.id = err.updater
left join ecw_currency cc on err.currency = cc.id left join ecw_currency cc on err.currency = cc.id
left join ecw_express ee on err.courier_company = ee.id left join ecw_express ee on err.courier_company = ee.id
where 1=1 where 1=1
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
left join ecw_reward er on err.reward_id = er.id left join ecw_reward er on err.reward_id = er.id
left join member_user mu on mu.id = err.member_id left join member_user mu on mu.id = err.member_id
left join ecw_node en on er.node_id = en.id left join ecw_node en on er.node_id = en.id
left join system_user suc on suc.id = er.creator left join system_user suc on suc.id = err.creator
left join system_user suu on suu.id = er.updater left join system_user suu on suu.id = err.updater
left join ecw_express ee on err.courier_company = ee.id left join ecw_express ee on err.courier_company = ee.id
where 1=1 where 1=1
<include refid="pageCondition"/> <include refid="pageCondition"/>
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
left join member_user mu on mu.id = err.member_id left join member_user mu on mu.id = err.member_id
left join member_user_score mus on mu.id = mus.member_id left join member_user_score mus on mu.id = mus.member_id
left join ecw_node en on er.node_id = en.id left join ecw_node en on er.node_id = en.id
left join system_user suc on suc.id = er.creator left join system_user suc on suc.id = err.creator
left join system_user suu on suu.id = er.updater left join system_user suu on suu.id = err.updater
left join ecw_currency cc on err.currency = cc.id left join ecw_currency cc on err.currency = cc.id
left join ecw_express ee on err.courier_company = ee.id left join ecw_express ee on err.courier_company = ee.id
where err.id = #{id} where err.id = #{id}
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
left join ecw_reward er on err.reward_id = er.id left join ecw_reward er on err.reward_id = er.id
left join member_user mu on mu.id = err.member_id left join member_user mu on mu.id = err.member_id
left join ecw_node en on er.node_id = en.id left join ecw_node en on er.node_id = en.id
left join system_user suc on suc.id = er.creator left join system_user suc on suc.id = err.creator
left join system_user suu on suu.id = er.updater left join system_user suu on suu.id = err.updater
left join ecw_currency cc on err.currency = cc.id left join ecw_currency cc on err.currency = cc.id
left join ecw_express ee on err.courier_company = ee.id left join ecw_express ee on err.courier_company = ee.id
where 1=1 where 1=1
...@@ -120,8 +120,7 @@ ...@@ -120,8 +120,7 @@
suc.username as creatorName, suc.username as creatorName,
suu.username as updaterName, suu.username as updaterName,
cc.title_zh as currencyTitleZh, cc.title_zh as currencyTitleZh,
cc.title_en as currencyTitleEn, cc.title_en as currencyTitleEn
(select username from system_user where id = er.updater) as updaterName
</sql> </sql>
<sql id="pageCondition"> <sql id="pageCondition">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment