suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20240606_lastFix' into 'master'

Browse Source 
判空

See merge request hangzhou/java/custom_xfsg!11
This commit is contained in:
zhangchenbiao
2024-06-06 02:48:25 +00:00
parent 3365710d12 28fab7c2b7
commit b88b93b057
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -158,14 +158,14 @@ public class FirstOrderServiceImp implements FirstOrderService {
} else {
order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus());
}
if (Objects.nonNull(shopInfo.getSupervisorUserId())){
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
}
} catch (Exception e) {
log.error("获取鲜丰订货金异常", e);
}
}
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
return order;
}
}