|
|
@@ -193,18 +193,24 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
for (TOrderTaskBo t : list) {
|
|
|
if (type==OrderChangeType.CB.getCode()||type==OrderChangeType.JXMBG.getCode()){
|
|
|
Integer receiverType=null;
|
|
|
- if (t.getTaskReceiver().equals(t.getConsultantId())) {
|
|
|
- receiverType=0;
|
|
|
- }else if (t.getTaskReceiver().equals(t.getConsultantId())){
|
|
|
- receiverType=1;
|
|
|
+ System.out.println(t.getTaskReceiver()+"="+t.getManagerId());
|
|
|
+ System.out.println(t.getTaskReceiver().equals(t.getManagerId()));
|
|
|
+ if (t.getTaskReceiver()!=null){
|
|
|
+ if (t.getTaskReceiver().equals(t.getConsultantId())) {
|
|
|
+ receiverType=0;
|
|
|
+ }else if (t.getTaskReceiver().equals(t.getManagerId())){
|
|
|
+ receiverType=1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (receiverType!=null){
|
|
|
+ OrderExamine o=new OrderExamine();
|
|
|
+ o.setAid(t.getConsultantId());
|
|
|
+ o.setOrderNo(orderNo);
|
|
|
+ o.setCreateTime(new Date());
|
|
|
+ o.setType(receiverType);//咨询师
|
|
|
+ o.setStatus(0);//正常
|
|
|
+ orderExamineMapper.insertSelective(o);
|
|
|
}
|
|
|
- OrderExamine o=new OrderExamine();
|
|
|
- o.setAid(t.getConsultantId());
|
|
|
- o.setOrderNo(orderNo);
|
|
|
- o.setCreateTime(new Date());
|
|
|
- o.setType(receiverType);//咨询师
|
|
|
- o.setStatus(0);//正常
|
|
|
- orderExamineMapper.insertSelective(o);
|
|
|
}else if (type==OrderChangeType.XMJJEBG.getCode()||type==OrderChangeType.TDBTK.getCode() ||
|
|
|
type==OrderChangeType.TDTK.getCode()){
|
|
|
if (t.getConsultantId()!=null) {
|
|
|
@@ -681,7 +687,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
|
|
|
|
- if(changeType!=2)pushOrderCangeProcess(noc);
|
|
|
+ if(changeType!=2){
|
|
|
+ pushOrderCangeProcess(noc);
|
|
|
+ pushOrderExamine(noc.getOrderNo(),noc.getType());
|
|
|
+ }
|
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
|
return 1;
|
|
|
}
|