|
|
@@ -408,7 +408,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
- params.put("outsource", outsource==null?0:outsource);
|
|
|
+ params.put("outsource", outsource);
|
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
|
|
|
return p;
|
|
|
}
|
|
|
@@ -423,6 +423,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (orderStatus==OrderNewState.QDSHTG.getCode()) {
|
|
|
if (t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
|
|
|
t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
|
|
|
+ }else {
|
|
|
+ t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
}
|
|
|
if(outsource!=null&&outsource==1) {
|
|
|
t.setOutsource(outsource);
|
|
|
@@ -437,7 +439,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
addBackOrder(orderNo, reason);
|
|
|
addOrderLog(orderNo, OrderLogProcess.BH.getCode());
|
|
|
}
|
|
|
- t.setOrderStatus(orderStatus);
|
|
|
+
|
|
|
}else if (outsource==1) {//外包
|
|
|
o.setRefundStatus(0);
|
|
|
|
|
|
@@ -448,7 +450,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ t.setOrderStatus(orderStatus);
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|
|
|
@@ -591,7 +593,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public boolean chekeOrderStatus(String orderNo) {
|
|
|
TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
- if (tOrder.getOrderStatus()!=OrderNewState.QDDS.getCode()) {
|
|
|
+ if (tOrder.getOrderStatus()==OrderNewState.QDDS.getCode()||tOrder.getOrderStatus()==OrderNewState.QDSHTG.getCode()) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|