Commit 21f8bcac authored by 332784038@qq.com's avatar 332784038@qq.com

bugfix: 汇率持久化时更新操作人

parent 20bfd710
...@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.ecw.service.currencyRate; ...@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.ecw.service.currencyRate;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.ecw.convert.currencyRate.CurrencyRateConvert; import cn.iocoder.yudao.module.ecw.convert.currencyRate.CurrencyRateConvert;
import cn.iocoder.yudao.module.ecw.dal.dataobject.currencyRate.CurrencyRateDO; import cn.iocoder.yudao.module.ecw.dal.dataobject.currencyRate.CurrencyRateDO;
import cn.iocoder.yudao.module.ecw.dal.dataobject.currencyRate.CurrencyRateLogDO; import cn.iocoder.yudao.module.ecw.dal.dataobject.currencyRate.CurrencyRateLogDO;
...@@ -68,9 +70,15 @@ public class CurrencyRateServiceImpl implements CurrencyRateService { ...@@ -68,9 +70,15 @@ public class CurrencyRateServiceImpl implements CurrencyRateService {
CurrencyRateDO entity = CurrencyRateConvert.INSTANCE.from(req); CurrencyRateDO entity = CurrencyRateConvert.INSTANCE.from(req);
Date now = new Date(); Date now = new Date();
String user = Optional.ofNullable(SecurityFrameworkUtils.getLoginUser())
.map(LoginUser::getId)
.map(String::valueOf)
.orElse("");
entity.setCreateTime(now); entity.setCreateTime(now);
entity.setCreator(user);
entity.setUpdateTime(now); entity.setUpdateTime(now);
entity.setUpdater(user);
mapper.insert(entity); mapper.insert(entity);
} }
...@@ -97,6 +105,10 @@ public class CurrencyRateServiceImpl implements CurrencyRateService { ...@@ -97,6 +105,10 @@ public class CurrencyRateServiceImpl implements CurrencyRateService {
rate(req.getSourceAmount(), req.getTargetAmount()); // check rate rate(req.getSourceAmount(), req.getTargetAmount()); // check rate
Date now = new Date(); Date now = new Date();
String user = Optional.ofNullable(SecurityFrameworkUtils.getLoginUser())
.map(LoginUser::getId)
.map(String::valueOf)
.orElse("");
CurrencyRateLogDO change = new CurrencyRateLogDO(); CurrencyRateLogDO change = new CurrencyRateLogDO();
CurrencyRateDO saved = Optional.ofNullable(mapper.selectById(id)) CurrencyRateDO saved = Optional.ofNullable(mapper.selectById(id))
.orElseThrow(() -> exception(CURRENCY_RATE_NOT_EXISTS)); .orElseThrow(() -> exception(CURRENCY_RATE_NOT_EXISTS));
...@@ -116,10 +128,12 @@ public class CurrencyRateServiceImpl implements CurrencyRateService { ...@@ -116,10 +128,12 @@ public class CurrencyRateServiceImpl implements CurrencyRateService {
change.setRateId(id); change.setRateId(id);
change.setRemarks(req.getRemarks()); change.setRemarks(req.getRemarks());
change.setCreateTime(now); change.setCreateTime(now);
change.setCreator(user);
logMapper.insert(change); logMapper.insert(change);
CurrencyRateConvert.INSTANCE.update(saved, req); CurrencyRateConvert.INSTANCE.update(saved, req);
saved.setUpdateTime(now); saved.setUpdateTime(now);
saved.setUpdater(user);
mapper.updateById(saved); mapper.updateById(saved);
} }
......
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