|
|
@@ -541,17 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tl.setOrderNo(orderNo);
|
|
|
tl.setProcess(OrderLogProcess.FQWB.getCode());
|
|
|
addOrderLog(tl);
|
|
|
- //外包
|
|
|
- o.setRefundStatus(0);
|
|
|
- System.out.println("==============================外包测试");
|
|
|
- if(o.getId()==null) {
|
|
|
- System.out.println("==============================新建外包");
|
|
|
- o.setCreateTime(new Date());
|
|
|
- tOrderOutsourceMapper.insertSelective(o);
|
|
|
- }else {
|
|
|
- System.out.println("==============================修改外包");
|
|
|
- tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
}
|
|
|
}else {
|
|
|
@@ -566,6 +556,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//增加日志
|
|
|
addOrderLog(tl);
|
|
|
//非特批增加催款信息
|
|
|
+ //外包
|
|
|
+ o.setRefundStatus(0);
|
|
|
+ if(o.getId()==null) {
|
|
|
+ o.setCreateTime(new Date());
|
|
|
+ tOrderOutsourceMapper.insertSelective(o);
|
|
|
+ }else {
|
|
|
+ tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
+ }
|
|
|
if(t2.getApproval()==0)pushOrderDun(t2);
|
|
|
}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
|
|
|
if (outsource==0) {//非外包
|