|
|
@@ -497,9 +497,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
aids.add(t2.getSalesmanId());
|
|
|
type=NoticeStatus.ORDER_NO.getCode();
|
|
|
}
|
|
|
- pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
t.setOrderStatus(orderStatus);
|
|
|
- return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -948,6 +949,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Admin admin = adminMapper.selectAllByid(string);
|
|
|
if(admin!=null&&admin.getEmail()!=null)adminIds+=admin.getEmail()+",";
|
|
|
}
|
|
|
+ if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
|
|
|
if(StringUtils.isNotBlank(adminIds))adminIds.substring(0, adminIds.length()-1);
|
|
|
EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看");
|
|
|
try {
|
|
|
@@ -956,7 +958,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
} catch (UnsupportedEncodingException | MessagingException e) {
|
|
|
throw new BusinessException(new Error( "邮件发送错误","邮件发送错误"));
|
|
|
}
|
|
|
- if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
|
|
|
}
|
|
|
|
|
|
|