|
|
@@ -37,14 +37,12 @@ import com.goafanti.common.dao.OrganizationManagementMapper;
|
|
|
import com.goafanti.common.dao.TChangeDunMapper;
|
|
|
import com.goafanti.common.dao.TChangeTaskMapper;
|
|
|
import com.goafanti.common.dao.TOrderBillNewMapper;
|
|
|
-import com.goafanti.common.dao.TOrderDunMapper;
|
|
|
import com.goafanti.common.dao.TOrderInvoiceMapper;
|
|
|
import com.goafanti.common.dao.TOrderLogMapper;
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
import com.goafanti.common.dao.TTaskMidMapper;
|
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
-import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.OrderChangeLog;
|
|
|
@@ -53,11 +51,9 @@ import com.goafanti.common.model.OrderRefundInvoice;
|
|
|
import com.goafanti.common.model.TChangeDun;
|
|
|
import com.goafanti.common.model.TChangeTask;
|
|
|
import com.goafanti.common.model.TOrderBillNew;
|
|
|
-import com.goafanti.common.model.TOrderDun;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.common.model.TOrderTask;
|
|
|
import com.goafanti.common.model.TTaskMid;
|
|
|
-import com.goafanti.common.model.UserLockRelease;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.NewOrderChange;
|
|
|
import com.goafanti.common.model.NewOrderDun;
|
|
|
@@ -90,7 +86,6 @@ import com.goafanti.order.service.NewOrderDunService;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
-import com.goafanti.report.bo.userDataListBo;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
@Service
|
|
|
@@ -102,8 +97,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
|
@Autowired
|
|
|
- private TOrderDunMapper tOrderDunMapper;
|
|
|
- @Autowired
|
|
|
private TOrderLogMapper tOrderLogMapper;
|
|
|
@Autowired
|
|
|
private TOrderTaskMapper tOrderTaskMapper;
|
|
|
@@ -671,8 +664,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
pushTaskAndDun(nob.getId(),nob.getOrderNo());
|
|
|
}else if(nob.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
//先将业务锁关闭
|
|
|
- List<Integer> list=tOrderTaskMapper.getLockId(nb.getOrderNo(),o.getSalesmanId(),o.getBuyerId());
|
|
|
-
|
|
|
+ List<String> list=tOrderTaskMapper.getLockId(nb.getOrderNo(),o.getSalesmanId(),o.getBuyerId());
|
|
|
userLockReleaseMapper.updateReleaseList(list);
|
|
|
int i=userLockReleaseMapper.selectByUidGetCount(o.getSalesmanId(),o.getBuyerId());
|
|
|
if (i<1) {
|