|
|
@@ -1112,6 +1112,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
aids.add(e.getAid());
|
|
|
}
|
|
|
}
|
|
|
+ Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
|
|
|
+ updateFinanceCount(admin.getId(),t2.getCreateTime());
|
|
|
}
|
|
|
|
|
|
type=NoticeStatus.ORDER_YES.getCode();
|
|
|
@@ -1135,8 +1137,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
|
|
|
- Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
|
|
|
- updateFinanceCount(admin.getId(),t2.getCreateTime());
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -1738,20 +1738,31 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
|
|
|
- financeCountOrderUnauditedSubtraction(t,1);
|
|
|
+ financeCountOrderUnauditedSubtraction(t,0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
* @param use
|
|
|
- * @param type 0 未审核减一 1未审核与派单数都减一
|
|
|
+ * @param type 0 未审核减一 1未审核与派单数都减一 2 派单减一
|
|
|
*/
|
|
|
@Override
|
|
|
public void financeCountOrderUnauditedSubtraction(TOrderNew use,Integer type) {
|
|
|
Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
|
|
|
String startTime= DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
- financeCountMapper.updateOrderUnauditedSubtraction(admin.getId(),startTime,type);
|
|
|
+ FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
+ FinanceCount newFinance=new FinanceCount();
|
|
|
+ newFinance.setId(newFinance.getId());
|
|
|
+ if(type==0){
|
|
|
+ newFinance.setOrderUnauditedCount(financeCount.getOrderUnauditedCount()-1);
|
|
|
+ }else if(type==1){
|
|
|
+ newFinance.setOrderCount(financeCount.getOrderCount()-1);
|
|
|
+ newFinance.setOrderUnauditedCount(financeCount.getOrderUnauditedCount()-1);
|
|
|
+ }else if(type==2){
|
|
|
+ newFinance.setOrderCount(financeCount.getOrderCount()-1);
|
|
|
+ }
|
|
|
+ financeCountMapper.updateByPrimaryKeySelective(newFinance);
|
|
|
}
|
|
|
|
|
|
private TOrderNew checkDeleteSign(String orderNo) {
|