|
|
@@ -55,40 +55,35 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
//前端直接会直接调取上一个发起数据给新开票,防止前一个数据为审核后
|
|
|
if (o.getApproval()==2)o.setApproval(1);
|
|
|
if (o.getStatus()!=1)o.setStatus(1);
|
|
|
- pushOrderInvoiceExamine(o,null);
|
|
|
+ pushOrderInvoiceExamine(o);
|
|
|
Integer i=tOrderInvoiceMapper.insertSelective(o);
|
|
|
addInvoiceLog(o.getId(),0);
|
|
|
return i;
|
|
|
}
|
|
|
|
|
|
- private void pushOrderInvoiceExamine(TOrderInvoice o,Integer examine) {
|
|
|
+ private void pushOrderInvoiceExamine(TOrderInvoice o) {
|
|
|
//新增与修改
|
|
|
List<Admin> admins =new ArrayList<>();
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
TOrderNewBo t = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
|
|
|
if (o.getType()==0){
|
|
|
- if (examine==null){
|
|
|
- if (o.getApproval()==0){
|
|
|
- addExamineFinance(o, t);
|
|
|
- }else {
|
|
|
- admins = adminMapper.getAdminRoleTypeList(AFTConstants.HN_APPROVED);
|
|
|
- }
|
|
|
- }else if (examine==2){
|
|
|
+ if (o.getApproval()==0){
|
|
|
addExamineFinance(o, t);
|
|
|
- }else if (examine==3){
|
|
|
+ }else if(o.getApproval()==1&&o.getStatus()==1){
|
|
|
+ admins = adminMapper.getAdminRoleTypeList(AFTConstants.HN_APPROVED);
|
|
|
+ }else if (o.getApproval()==1&&o.getStatus()==2){
|
|
|
+ addExamineFinance(o, t);
|
|
|
+ }else if (o.getApproval()==1&&o.getStatus()==3){
|
|
|
o.setExamineName("");
|
|
|
}
|
|
|
-
|
|
|
}else if (o.getType()==1){
|
|
|
- if (examine==null){
|
|
|
- if(o.getApproval()==0) {
|
|
|
- admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
- }else {
|
|
|
- admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.COMPANY_MANAGER);
|
|
|
- }
|
|
|
- }else if (examine==2){
|
|
|
+ if(o.getApproval()==0) {
|
|
|
+ admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
+ }else if(o.getApproval()==1&&o.getStatus()==1) {
|
|
|
+ admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.COMPANY_MANAGER);
|
|
|
+ }else if (o.getApproval()==1&&o.getStatus()==2){
|
|
|
admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
- }else if (examine==3){
|
|
|
+ }else if (o.getApproval()==1&&o.getStatus()==3){
|
|
|
o.setExamineName("");
|
|
|
}
|
|
|
}
|
|
|
@@ -121,7 +116,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
addInvoiceLog(o.getId(),5);
|
|
|
o.setStatus(1);
|
|
|
int i=tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
|
|
|
- pushOrderInvoiceExamine(o,null);
|
|
|
+ pushOrderInvoiceExamine(o);
|
|
|
return i;
|
|
|
}
|
|
|
/**
|
|
|
@@ -331,9 +326,9 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
}else if(o.getType()==1) {
|
|
|
aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
|
|
|
}
|
|
|
- pushOrderInvoiceExamine(o,examine);
|
|
|
|
|
|
}
|
|
|
+ pushOrderInvoiceExamine(o);
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
|
|
|
orderNewService.pushGeneralSendNoticeAndEmail(aids,type,order, TokenManager.getAdminId(),0);
|
|
|
return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
|