|
|
@@ -233,6 +233,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
|
public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
|
|
|
List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
|
|
|
+ if (!list.isEmpty()){
|
|
|
+ for (NewOrderChangeBo c : list) {
|
|
|
+ if (c.getContacts()==null){
|
|
|
+ TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ c.setContacts(t.getContacts());
|
|
|
+ c.setContactMobile(t.getContactMobile());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@@ -736,6 +745,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setApplicant(t.getApplicant());
|
|
|
noc.setStatus(1);//订单置为正常
|
|
|
noc.setDepName(t.getDepName());
|
|
|
+ noc.setContacts(t.getContacts());
|
|
|
+ noc.setContactMobile(t.getContactMobile());
|
|
|
+ noc.setManagerContacts(t.getManagerContacts());
|
|
|
+ noc.setManagerContactMobile(t.getManagerContactMobile());
|
|
|
Date date =new Date();
|
|
|
addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId(),date);
|
|
|
if(t.getType()!=0)chekeAmout(t);
|
|
|
@@ -795,6 +808,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
}else if (changeType==2) {
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
+ noc.setCwIndirectCost(t.getCwIndirectCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|