Commit d7884930 by 吴一龙

解约人使用员工昵称

parent 344816dc
...@@ -295,7 +295,7 @@ public class AxfServiceImpl implements AxfService { ...@@ -295,7 +295,7 @@ public class AxfServiceImpl implements AxfService {
return null == studio ? "" : studio.getName(); return null == studio ? "" : studio.getName();
}, adminId -> { }, adminId -> {
AdminVO admin = studioRpcService.getAdmin(params.getOperatorId()); AdminVO admin = studioRpcService.getAdmin(params.getOperatorId());
return null == admin ? "" : admin.getName(); return null == admin ? "" : admin.getNickName();
}); });
studioAxfApplyRpService.insert(apply); studioAxfApplyRpService.insert(apply);
...@@ -424,7 +424,7 @@ public class AxfServiceImpl implements AxfService { ...@@ -424,7 +424,7 @@ public class AxfServiceImpl implements AxfService {
} }
StudioAxfOrder toModify = StudioAxfOrder.builder().id(id).cancelOpId(opId) StudioAxfOrder toModify = StudioAxfOrder.builder().id(id).cancelOpId(opId)
.signState(AxfOrderSignStateEnums.CANCEL_PROCESS.getCode()).cancelOpName(admin.getName()) .signState(AxfOrderSignStateEnums.CANCEL_PROCESS.getCode()).cancelOpName(admin.getNickName())
.cancelFailMessage("").updateTime(new Date()).build(); .cancelFailMessage("").updateTime(new Date()).build();
studioAxfOrderRpService.updateById(toModify); studioAxfOrderRpService.updateById(toModify);
...@@ -1218,7 +1218,7 @@ public class AxfServiceImpl implements AxfService { ...@@ -1218,7 +1218,7 @@ public class AxfServiceImpl implements AxfService {
studioAxfOrderRpService.updateById( studioAxfOrderRpService.updateById(
StudioAxfOrder.builder().id(id).signState(AxfOrderSignStateEnums.SIGN.getCode()).cancelOpId(-1L) StudioAxfOrder.builder().id(id).signState(AxfOrderSignStateEnums.SIGN.getCode()).cancelOpId(-1L)
.cancelOpName("").cancelFailMessage( .cancelOpName("").cancelFailMessage(
DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss") + " " + admin.getName() DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss") + " " + admin.getNickName()
+ "发起解约,解约失败,如需解约请重新操作").build()); + "发起解约,解约失败,如需解约请重新操作").build());
} }
......
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