|
|
@@ -122,6 +122,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.yc.ship.framework.common.util.collection.CollectionUtils.convertList;
|
|
|
import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
|
|
|
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
|
|
|
import static com.yc.ship.module.trade.enums.ApiConstants.*;
|
|
|
import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
|
|
|
import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.PRODUCT_BASE_TYPE_SELF;
|
|
|
@@ -2441,9 +2442,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
TradeOrderConfirmationVO orderRespNewVO = BeanUtils.toBean(tradeOrderDO, TradeOrderConfirmationVO.class);
|
|
|
// 获取最新的审核人
|
|
|
TradeOrderAuditDO tradeOrderAuditDO = tradeOrderAuditMapper.selectNewAuditorByOrderNo(tradeOrderDO.getOrderNo());
|
|
|
- AdminUserRespDTO auditor = adminUserApi.getUser(tradeOrderAuditDO.getAuditUser());
|
|
|
- if (auditor != null) {
|
|
|
- orderRespNewVO.setAuditorName(auditor.getNickname());
|
|
|
+ if(tradeOrderAuditDO != null) {
|
|
|
+ AdminUserRespDTO auditor = adminUserApi.getUser(tradeOrderAuditDO.getAuditUser());
|
|
|
+ if (auditor != null) {
|
|
|
+ orderRespNewVO.setAuditorName(auditor.getNickname());
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ String loginUserNickname = getLoginUserNickname();
|
|
|
+ orderRespNewVO.setAuditorName(loginUserNickname);
|
|
|
}
|
|
|
|
|
|
//设置订单登记人姓名
|