|
|
@@ -694,6 +694,42 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
return tOrderNewMapper.selectgetAll();
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Object operationGuaranteeAudit(String orderNo, Integer type, String reason) {
|
|
|
+ TOrderNew t= new TOrderNew();
|
|
|
+ TOrderNew t2= checkDeleteSign(orderNo);
|
|
|
+ List<String> aids = new ArrayList<>();
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ t.setOrderNo(orderNo);
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
+ tl.setAid(TokenManager.getAdminId());
|
|
|
+ tl.setOrderNo(orderNo);
|
|
|
+ tl.setProcess(OrderLogProcess.YXJLTT.getCode());
|
|
|
+ TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
+ if (type==0){
|
|
|
+ t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
+ t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
+ tl.setProcess(OrderLogProcess.YYBZSHBH.getCode());
|
|
|
+ aids.add(t.getSalesmanId());
|
|
|
+ } else if (type==1) {
|
|
|
+ t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
+ tl.setProcess(OrderLogProcess.YYBZSHTG.getCode());
|
|
|
+ if (t.getApproval().equals(ApprovalNewState.TPDSH.getCode())){
|
|
|
+ str.append(order.getOperationGuaranteeName()).append(",");
|
|
|
+ }else if (t.getApproval().equals(ApprovalNewState.DSZDSH.getCode())){
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
|
|
|
+ admins.forEach(e->{
|
|
|
+ aids.add(e.getId());
|
|
|
+ str.append(e.getName()).append(",");
|
|
|
+ });
|
|
|
+ }
|
|
|
+ t.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ }
|
|
|
+ addOrderLog(tl,reason);
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
+ return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ }
|
|
|
+
|
|
|
private void pushMaxDuration(TOrderNewBo t,TOrderPublicReleaseCount out ) {
|
|
|
BigDecimal res=BigDecimal.ZERO;
|
|
|
//新增如果有会员年份,计算金额改为总金额除以年份
|
|
|
@@ -1995,19 +2031,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
//只有到技术总监是派单,其他都是审核
|
|
|
if (order.getProcessStatus()==null||(!order.getProcessStatus().equals(ProcessStatus.YPZXSGLY.getCode()))){
|
|
|
- str=str.append("[审核]");
|
|
|
- }else if (order.getProcessStatus().equals(ProcessStatus.YPZXSGLY.getCode())){
|
|
|
- str=str.append("[派单]");
|
|
|
+ str.append("[审核]");
|
|
|
+ }else {
|
|
|
+ str.append("[派单]");
|
|
|
+ }
|
|
|
+ str.append(approvalType).append(noticeTypeName).append(":");
|
|
|
+ if (tid != null) {
|
|
|
+ str.append("项目编号[").append(tid).append("],");
|
|
|
}
|
|
|
- str=str.append(approvalType).append(noticeTypeName).append(":");
|
|
|
- if (tid != null) {str=str.append("项目编号[").append(tid).append("],");}
|
|
|
- str=str.append("客户名称[") .append(order.getUserName()).append("],");
|
|
|
+ str.append("客户名称[") .append(order.getUserName()).append("],");
|
|
|
if(StringUtils.isNotBlank(order.getContractNo())) {
|
|
|
- str=str.append("合同编号[").append(order.getContractNo()).append("],");
|
|
|
+ str.append("合同编号[").append(order.getContractNo()).append("],");
|
|
|
}
|
|
|
- str=str.append("订单编号[").append(order.getOrderNo()).append("],").append("操作人:")
|
|
|
+ str.append("订单编号[").append(order.getOrderNo()).append("],").append("操作人:")
|
|
|
.append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
|
|
|
- String adminIds="";
|
|
|
+ StringBuilder adminIds= new StringBuilder();
|
|
|
List<Notice> nlist=new ArrayList<>();
|
|
|
for (String string : alist) {
|
|
|
Notice n =new Notice();
|
|
|
@@ -2021,17 +2059,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Admin admin = adminMapper.selectAllByid(string);
|
|
|
//去除邮件重复的
|
|
|
if(admin!=null&&admin.getEmail()!=null&&SendEmailUtil.isEmail(admin.getEmail().trim())){
|
|
|
- if (!adminIds.contains(admin.getEmail())){
|
|
|
- adminIds+=admin.getEmail()+",";
|
|
|
+ if (!adminIds.toString().contains(admin.getEmail())){
|
|
|
+ adminIds.append(admin.getEmail()).append(",");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if(!nlist.isEmpty()) {
|
|
|
asyncUtils.addNoticeBatch(nlist);
|
|
|
}
|
|
|
- if (!nlist.isEmpty()&&StringUtils.isNotBlank(adminIds)) {
|
|
|
- adminIds=adminIds.substring(0, adminIds.length()-1);
|
|
|
- EmailBo bo=new EmailBo(noticeTypeName,adminIds,str.toString());
|
|
|
+ if (!nlist.isEmpty()&&StringUtils.isNotBlank(adminIds.toString())) {
|
|
|
+ adminIds = new StringBuilder(adminIds.substring(0, adminIds.length() - 1));
|
|
|
+ EmailBo bo=new EmailBo(noticeTypeName, adminIds.toString(),str.toString());
|
|
|
asyncUtils.send(bo);
|
|
|
}
|
|
|
}
|