|
|
@@ -548,7 +548,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
pushTaskAndDun(nob.getId(),nob.getOrderNo());
|
|
|
}else if (nob.getType()==OrderChangeType.JJEBG.getCode()) {
|
|
|
o.setTotalAmount(nob.getTotalAmount());
|
|
|
- }else if (nob.getType()==OrderChangeType.CB.getCode()||nob.getType()==OrderChangeType.ZS.getCode()) {
|
|
|
+ }else if (nob.getType()==OrderChangeType.CB.getCode()){
|
|
|
+ o.setTotalAmount(nob.getTotalAmount());
|
|
|
+ pushTaskAndDun(nob.getId(),nob.getOrderNo());
|
|
|
+ }else if (nob.getType()==OrderChangeType.ZS.getCode()) {
|
|
|
pushTaskAndDun(nob.getId(),nob.getOrderNo());
|
|
|
}
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
|
@@ -594,9 +597,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nd.setWaitDay(cd.getWaitDay());
|
|
|
nd.setStartTime(cd.getStartTime());
|
|
|
nd.setEffectiveCount(cd.getEffectiveCount());
|
|
|
+ if (cd.getDunType()==1) {
|
|
|
+ nd.setStatus(1);
|
|
|
+ nd.setStartTime(new Date());
|
|
|
+ }
|
|
|
newOrderDunMapper.insertSelective(nd);
|
|
|
}else if (cd.getType()==2) {
|
|
|
- nd.setId(cd.getTid());
|
|
|
+ nd.setId(cd.getDid());
|
|
|
nd.setMoney(cd.getMoney());
|
|
|
newOrderDunMapper.updateByPrimaryKeySelective(nd);
|
|
|
}else if(cd.getType()==3) {
|