|
|
@@ -231,7 +231,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public InputAddTask addOrderTask(InputAddTask t) {
|
|
|
- TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
|
|
|
+ TOrderNew order=tOrderNewMapper.queryById(t.getOrderNo());
|
|
|
checkOrder(order,t);
|
|
|
t.setTaskStatus(TaskState.WFP.getCode());
|
|
|
t.setProjectStatus(NewProjectStatus.WQD.getCode());
|
|
|
@@ -505,7 +505,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Transactional
|
|
|
public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
|
|
|
Date date=new Date();
|
|
|
- TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
|
|
|
+ TOrderNew t2=tOrderNewMapper.queryById(t.getOrderNo());
|
|
|
//判断手机号码是否存在
|
|
|
if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
|
|
|
organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {
|
|
|
@@ -1583,7 +1583,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
private void addBackOrder(String orderNo, String reason) {
|
|
|
TOrderBack ob=new TOrderBack();
|
|
|
- TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
|
|
|
ob.setCreateTime(new Date());
|
|
|
ob.setOrderNo(orderNo);
|
|
|
ob.setReason(reason);
|
|
|
@@ -1802,7 +1802,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public boolean chekeOrderStatus(String orderNo) {
|
|
|
- TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
|
|
|
if (tOrder.getOrderStatus().equals(OrderNewState.QDDS.getCode()) || tOrder.getOrderStatus().equals(OrderNewState.QDSHTG.getCode())) {
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1811,7 +1811,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public boolean chekeProcessStatus(String orderNo) {
|
|
|
- TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
|
|
|
if (tOrder.getProcessStatus().equals(ProcessStatus.YPYXY.getCode())) {
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1821,7 +1821,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public boolean chekeApprovalOrderStatus(String orderNo) {
|
|
|
- TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
|
|
|
if (tOrder.getApproval().equals(ApprovalNewState.FTP.getCode()) ||
|
|
|
tOrder.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
|
|
|
tOrder.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
|
|
|
@@ -1832,7 +1832,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public int deleteOrderNew(String orderNo) {
|
|
|
- TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew t=tOrderNewMapper.queryById(orderNo);
|
|
|
if (t.getOrderStatus().equals(OrderNewState.YBH.getCode()) || t.getOrderStatus().equals(OrderNewState.YTD.getCode()) ||
|
|
|
t.getOrderStatus().equals(OrderNewState.DQD.getCode()) || t.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode())) {
|
|
|
t.setOrderNo(orderNo);
|
|
|
@@ -1874,7 +1874,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public boolean checkOderSettlementAmount(String orderNo) {
|
|
|
- TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
|
|
|
if (tOrder.getSettlementAmount()==null||
|
|
|
tOrder.getSettlementAmount().doubleValue()==0||
|
|
|
tOrder.getOrderStatus().equals(OrderNewState.TDZ.getCode())){
|
|
|
@@ -1969,7 +1969,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@Override
|
|
|
public int updateOrderOver(String orderNo) {
|
|
|
- TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew t=tOrderNewMapper.queryById(orderNo);
|
|
|
if (!t.getLiquidationStatus().equals(LiquidationNewState.ALREADY_PAY.getCode()) ||
|
|
|
!t.getProcessStatus().equals(ProcessStatus.YQBFPZXSGLY.getCode())) {
|
|
|
return -1;
|
|
|
@@ -2098,7 +2098,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
}
|
|
|
private TOrderNew checkDeleteSign(String orderNo) {
|
|
|
- TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ TOrderNew t=tOrderNewMapper.queryById(orderNo);
|
|
|
//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
|
|
|
return t;
|
|
|
}
|
|
|
@@ -2515,7 +2515,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
for (TOrderNew e : tOrderNews) {
|
|
|
pushOrderDunContent(e);
|
|
|
}
|
|
|
-// TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey("412255829035991040");
|
|
|
+// TOrderNew tOrderNew = tOrderNewMapper.queryById("412255829035991040");
|
|
|
// pushOrderDunContent(tOrderNew);
|
|
|
}
|
|
|
|