Merge branch 'cc_20240606_lastFix' into 'master'
last_time See merge request hangzhou/java/custom_xfsg!16
This commit is contained in:
@@ -136,6 +136,10 @@ public class FirstOrderServiceImp implements FirstOrderService {
|
||||
String userName = enterpriseUserDAO.getUserName(order.getCreateUserId());
|
||||
order.setPartnerName(userName);
|
||||
order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus());
|
||||
if (Objects.nonNull(shopInfo.getSupervisorUserId())){
|
||||
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
|
||||
order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
|
||||
}
|
||||
return order;
|
||||
}
|
||||
if (Objects.nonNull(order)) {
|
||||
|
||||
Reference in New Issue
Block a user