Browse Source

修改订单项目修改时,处理子项数据

anderx 3 years ago
parent
commit
4499d27f39

+ 31 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -522,6 +522,37 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 新增会员子项目
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/addMemberSonProject" ,method = RequestMethod.POST)
+	public Result addMemberSonProject(Integer id,String serviceYear,String taskComment){
+		Result res = new Result();
+		if(id==null||StringUtils.isBlank(serviceYear)||StringUtils.isBlank(taskComment)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
+			return res;
+		}
+		return res.data(orderChangeService.addMemberSonProject( id, serviceYear, taskComment));
+
+	}
+
+	/**
+	 * 删除会员子项目
+	 *
+	 * @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(orderChangeService.deleteMemberSonProject( id));
+	}
+
 
 
 

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

@@ -601,7 +601,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/addMemberSonProject" ,method = RequestMethod.POST)
 	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)){
+		if(tid==null||StringUtils.isBlank(serviceYear)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
 			return res;
 		}

+ 4 - 1
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -39,7 +39,6 @@ public interface OrderChangeService {
 	 * @param timeType
 	 * @param startTime
 	 * @param endTime
-	 * @param depId
 	 * @param salesmanName
 	 * @param complete
 	 * @param orderNo
@@ -108,4 +107,8 @@ public interface OrderChangeService {
 	int pushCompleteRefund(NewOrderChangeBo nb);
 
     boolean checkChangeId(Integer id);
+
+    Object addMemberSonProject(Integer id, String serviceYear, String taskComment);
+
+	int deleteMemberSonProject(Integer id);
 }

+ 33 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -703,6 +703,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return false;
 	}
 
+
+
 	/**
 	 * 修改订单数据
 	 * @param nb
@@ -1186,5 +1188,36 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				return 1;
 			}
 
+	@Override
+	public Object addMemberSonProject(Integer id, String serviceYear, String taskComment) {
+		Date date =new Date();
+		TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
+		tChangeTask.setSplitStatus(1);
+		tChangeTaskMapper.updateByPrimaryKey(tChangeTask);
+		tChangeTask.setId(null);
+		tChangeTask.setSplitStatus(2);
+		tChangeTask.setSplitSuper(id);
+		tChangeTask.setCommodityQuantity(1);
+		tChangeTask.setTaskComment(taskComment);
+		tChangeTask.setServiceLife(serviceYear);
+		tChangeTaskMapper.insertSelective(tChangeTask);
+		return tChangeTask;
+	}
+
+	@Override
+	public int deleteMemberSonProject(Integer id) {
+		TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
+		tChangeTaskMapper.deleteByPrimaryKey(id);
+		List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getSplitSuper(), tChangeTask.getCid());
+		//如果没有子项目则修改上级
+		if (tChangeTasks==null||tChangeTasks.isEmpty()){
+			TChangeTask changeTask = new TChangeTask();
+			changeTask.setId(tChangeTask.getSplitSuper());
+			changeTask.setSplitStatus(0);
+			tChangeTaskMapper.updateByPrimaryKeySelective(changeTask);
+		}
+		return 1;
+	}
+
 
 }

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

@@ -1352,7 +1352,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		//如果没有子项目则修改上级
 		if (tOrderTaskListBos==null||tOrderTaskListBos.isEmpty()){
 			TOrderTask tOrderTask=new TOrderTask();
-			tOrderTask.setId(id);
+			tOrderTask.setId(task.getSplitSuper());
 			tOrderTask.setSplitStatus(0);
 			tOrderTaskMapper.updateByPrimaryKeySelective(tOrderTask);
 		}