Browse Source

新增删除子项目接口开发

anderx 3 years ago
parent
commit
0e03116798

+ 18 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -587,7 +587,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	public Result addMemberFirstSonProject(Integer tid,String serviceYear,String taskComment){
 		Result res = new Result();
 		if(tid==null||StringUtils.isBlank(serviceYear)||StringUtils.isBlank(taskComment)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
 			return res;
 		}
 		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,null,null));
@@ -602,11 +602,27 @@ public class OrderProjectApiController extends CertifyApiController {
 	public Result addMemberSonProject(Integer tid,String serviceYear,String taskComment,Integer memberType,String pictureUrl){
 		Result res = new Result();
 		if(tid==null||StringUtils.isBlank(serviceYear)||StringUtils.isBlank(taskComment)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
 			return res;
 		}
 		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,memberType, pictureUrl));
 
 	}
 
+	/**
+	 * 删除会员子项目
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteMemberSonProject" ,method = RequestMethod.POST)
+	public Result deleteMemberSonProject(Integer id){
+		Result res = new Result();
+		if(id==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		return res.data(orderProjectService.deleteMemberSonProject( id));
+
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -114,4 +114,6 @@ public interface OrderProjectService {
 	 * @param  result 0审核 1通过
 	 */
 	void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType,Integer result);
+
+	int deleteMemberSonProject(Integer id);
 }

+ 18 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1285,6 +1285,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}
 	}
 
+
+
 	/**
 	 * 会员项目完成审核调用
 	 * @param b
@@ -1338,7 +1340,22 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}
 	}
 
-
+	@Override
+	public int deleteMemberSonProject(Integer id) {
+		TOrderTask task = tOrderTaskMapper.selectByPrimaryKey(id);
+		List<TOrderTaskListBo> tOrderTaskListBos = tOrderTaskMapper.splitProjectList(task.getSplitSuper());
+		//如果没有子项目则修改上级
+		if (tOrderTaskListBos==null||tOrderTaskListBos.isEmpty()){
+			TOrderTask tOrderTask=new TOrderTask();
+			tOrderTask.setId(id);
+			tOrderTask.setSplitStatus(0);
+			tOrderTaskMapper.updateByPrimaryKeySelective(tOrderTask);
+		}
+		tTaskMidMapper.deleteByPrimaryKey(id);
+		tTaskMemberMapper.deleteByPrimaryKey(id);
+		tTaskLogMapper.deleteByPrimaryKey(id);
+		return 1;
+	}
 
 
 }