|
|
@@ -307,7 +307,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
|
|
|
}
|
|
|
//发送站内信息与邮件
|
|
|
- orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), a.getId());
|
|
|
+ orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), TokenManager.getAdminId());
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -412,12 +412,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ocl.setChangeId(noc.getId());
|
|
|
ocl.setStatus(0);
|
|
|
orderChangeLogMapper.insertSelective(ocl);
|
|
|
+ sendNotice(0, t);
|
|
|
}else if (changeType==2) {
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
|
t.setProcessState(1);//流程置为营销管理员
|
|
|
- sendNotice(0, t);
|
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
|
return 1;
|
|
|
}
|