|
|
@@ -467,6 +467,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional
|
|
|
public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
|
|
|
Date date=new Date();
|
|
|
TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
|
|
|
@@ -583,11 +584,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t.getApproval());
|
|
|
}
|
|
|
+ //驳回重新发起,需要刷新当天和今天
|
|
|
+ boolean newOrderFlag=false;
|
|
|
if (t2.getApproval().equals(ApprovalNewState.ZCBH.getCode()) ||
|
|
|
t2.getApproval().equals(ApprovalNewState.DSZBH.getCode()) ||
|
|
|
t2.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
|
|
|
t2.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
|
|
|
t.setCreateTime(date);
|
|
|
+ newOrderFlag=true;
|
|
|
tOrderBackMapper.updateByOrderNoAndBackStatus(t.getOrderNo());
|
|
|
}
|
|
|
// 0 相等
|
|
|
@@ -606,6 +610,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
|
|
|
+ if (newOrderFlag){
|
|
|
+ updateAdminUserCountOrder(t2.getSalesmanId(),date);
|
|
|
+ }
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -615,10 +622,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
String endTime=startTime+" 23:59:59";
|
|
|
AdminUserCount adminUserCount = adminUserCountMapper.selectByaidAndDate(aid, startTime);
|
|
|
Integer orderCount = tOrderNewMapper.selectAidAndDate(aid, startTime, endTime);
|
|
|
-
|
|
|
if (adminUserCount==null){
|
|
|
AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
|
|
|
+ if (selectAUC==null)selectAUC=new AdminUserCount();
|
|
|
selectAUC.setOrderCount(orderCount);
|
|
|
+ selectAUC.setAid(aid);
|
|
|
+ selectAUC.setDateTime(transferTime);
|
|
|
adminUserCountMapper.insertSelective(selectAUC);
|
|
|
}else {
|
|
|
AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
|
|
|
@@ -1468,7 +1477,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
order.setProcessStatus(t.getProcessStatus());
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
//新增特批催款信息
|
|
|
- return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1695,7 +1706,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public int updatetechnicianBackOrder(String orderNo,String reason) {
|
|
|
TOrderNew t = checkDeleteSign(orderNo);
|
|
|
-
|
|
|
t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
t.setFinanceId("");
|
|
|
@@ -1704,7 +1714,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
aids.add(t.getSalesmanId());
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
|
|
|
- return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
private TOrderNew checkDeleteSign(String orderNo) {
|