|
|
@@ -62,16 +62,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
@Override
|
|
|
public TaskDetailsBo getByTid(Integer id) {
|
|
|
TaskDetailsBo res = new TaskDetailsBo();
|
|
|
+
|
|
|
TaskDetails taskDetails=taskDetailsMapper.selectByTid(id);
|
|
|
+ //首先直接查找,找不到的情况下找订单
|
|
|
+ TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
+ TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
+ List<Map<String,Object >> list=new ArrayList<>();
|
|
|
if (taskDetails==null){
|
|
|
- return res;
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
- TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
- TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
- List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+
|
|
|
//如果是会员
|
|
|
TOrderTaskBo thisTask = null;
|
|
|
for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
@@ -97,6 +97,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
list.add(map);
|
|
|
}
|
|
|
}
|
|
|
+ return res;
|
|
|
+ }
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
String lvl=null;
|
|
|
@@ -113,8 +115,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setMemberLvl(lvl);
|
|
|
res.setTaskList(list);
|
|
|
-
|
|
|
-
|
|
|
+ res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
return res;
|
|
|
}
|
|
|
|