|
@@ -1,7 +1,9 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
|
|
import com.goafanti.common.dao.TOrderAssistMapper;
|
|
import com.goafanti.common.dao.TOrderAssistMapper;
|
|
|
|
|
+import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.model.TOrderAssist;
|
|
import com.goafanti.common.model.TOrderAssist;
|
|
|
|
|
+import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.order.bo.assistListBo;
|
|
import com.goafanti.order.bo.assistListBo;
|
|
|
import com.goafanti.order.service.OrderAssistService;
|
|
import com.goafanti.order.service.OrderAssistService;
|
|
@@ -14,6 +16,8 @@ import java.util.List;
|
|
|
public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> implements OrderAssistService {
|
|
public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> implements OrderAssistService {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TOrderAssistMapper tOrderAssistMapper;
|
|
private TOrderAssistMapper tOrderAssistMapper;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private TOrderNewMapper tOrderNewMapper;
|
|
|
@Override
|
|
@Override
|
|
|
public int addAssist(TOrderAssist in) {
|
|
public int addAssist(TOrderAssist in) {
|
|
|
return tOrderAssistMapper.insertSelective(in);
|
|
return tOrderAssistMapper.insertSelective(in);
|
|
@@ -21,6 +25,21 @@ public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> i
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<assistListBo> assistList(String orderNo) {
|
|
public List<assistListBo> assistList(String orderNo) {
|
|
|
- return null;
|
|
|
|
|
|
|
+ return tOrderAssistMapper.assistList(orderNo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public int addAssistCheck(TOrderAssist in) {
|
|
|
|
|
+ List<assistListBo> list = assistList(in.getOrderNo());
|
|
|
|
|
+ for (assistListBo bo : list) {
|
|
|
|
|
+ if (bo.getAid().equals(in.getAid())){
|
|
|
|
|
+ return -1;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ TOrderNew t=tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
|
|
|
+ if (t.getProcessStatus()>4){
|
|
|
|
|
+ return -2;
|
|
|
|
|
+ }
|
|
|
|
|
+ return 0;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|