|
|
@@ -572,7 +572,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//修改项目为外包项目
|
|
|
tOrderTaskMapper.updateByOutsourceToOrderNo(orderNo,1);
|
|
|
}
|
|
|
- pushOrderDun(t2);
|
|
|
+// pushOrderDun(t2);
|
|
|
}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
|
|
|
if (outsource==0) {//非外包
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
@@ -592,39 +592,39 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
|
|
|
- public void pushOrderDun(TOrderNew t2) {
|
|
|
- List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(t2.getOrderNo(),null,0);
|
|
|
+ public void pushOrderDun(String orderNo) {
|
|
|
+ List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,null,0);
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
if (o.getDunType()==1) {
|
|
|
o.setStatus(1);
|
|
|
o.setStartTime(new Date());
|
|
|
newOrderDunMapper.updateByPrimaryKeySelective(o);
|
|
|
tOrderMidMapper.addOrderReceivables(o.getOrderNo(),o.getMoney());
|
|
|
- TOrderMid tm=tOrderMidMapper.selectByOrderNo(t2.getOrderNo());
|
|
|
+ TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
|
|
|
TArrearsDun t=new TArrearsDun();
|
|
|
t.setOrderArrears(tm.getOrderArrears());
|
|
|
t.setOrderReceivables(tm.getOrderReceivables());
|
|
|
- if (tArrearsDunMapper.checkOrderNo(t2.getOrderNo(),null)<1) {
|
|
|
- t.setOrderNo(t2.getOrderNo());
|
|
|
+ if (tArrearsDunMapper.checkOrderNo(orderNo,null)<1) {
|
|
|
+ t.setOrderNo(orderNo);
|
|
|
tArrearsDunMapper.insertSelective(t);
|
|
|
- }else if(tArrearsDunMapper.checkOrderNo(t2.getOrderNo(),0)>0){
|
|
|
- Integer i=tArrearsDunMapper.selectByStatus(t2.getOrderNo(), 0);
|
|
|
+ }else if(tArrearsDunMapper.checkOrderNo(orderNo,0)>0){
|
|
|
+ Integer i=tArrearsDunMapper.selectByStatus(orderNo, 0);
|
|
|
t.setId(i);
|
|
|
tArrearsDunMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
- addNewDunNoticAndSendEmail(t2,o);
|
|
|
+ addNewDunNoticAndSendEmail(orderNo,o);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- public void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
|
|
|
+ public void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o) {
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
- TOrderNewBo b = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
- addNotic(t2.getOrderNo(),NoticeStatus.ORDER_DUN.getCode(),a, b);
|
|
|
+ TOrderNewBo b = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
+ addNotic(orderNo,NoticeStatus.ORDER_DUN.getCode(),a, b);
|
|
|
try {
|
|
|
- NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
|
|
|
+ NewDunsendEmail(orderNo,o.getId(), a, b);
|
|
|
} catch (UnsupportedEncodingException | MessagingException e) {
|
|
|
throw new BusinessException(new Error("邮件发送错误。"));
|
|
|
}
|
|
|
@@ -1375,6 +1375,5 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
}
|