Browse Source

修改新增会员

anderx 9 months ago
parent
commit
da6806c08e

+ 27 - 0
src/main/java/com/goafanti/order/bo/InputAddTask.java

@@ -3,6 +3,7 @@ package com.goafanti.order.bo;
 import com.goafanti.common.model.TOrderTask;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class InputAddTask  extends TOrderTask {
     private String serviceLife;
@@ -14,6 +15,15 @@ public class InputAddTask  extends TOrderTask {
     private BigDecimal lastYearCapital;
     private BigDecimal lastYearIncome;
     private String sonListStr;
+    private List<InputAddTask> sonList;
+
+    public List<InputAddTask> getSonList() {
+        return sonList;
+    }
+
+    public void setSonList(List<InputAddTask> sonList) {
+        this.sonList = sonList;
+    }
 
     public String getSonListStr() {
         return sonListStr;
@@ -86,4 +96,21 @@ public class InputAddTask  extends TOrderTask {
     public void setYearSum(Integer yearSum) {
         this.yearSum = yearSum;
     }
+
+
+    @Override
+    public String toString() {
+        return "InputAddTask{" +
+                "serviceLife='" + serviceLife + '\'' +
+                ", serviceYear='" + serviceYear + '\'' +
+                ", yearSum=" + yearSum +
+                ", change=" + change +
+                ", contractTerm='" + contractTerm + '\'' +
+                ", lastYear='" + lastYear + '\'' +
+                ", lastYearCapital=" + lastYearCapital +
+                ", lastYearIncome=" + lastYearIncome +
+                ", sonListStr='" + sonListStr + '\'' +
+                ", sonList=" + sonList +
+                '}';
+    }
 }

+ 20 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -19,6 +19,7 @@ import com.goafanti.order.service.OrderAssistService;
 import com.goafanti.order.service.OrderNewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -94,8 +95,25 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	/**
 	 * 添加项目、新增项目
 	 */
-	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
-	public Result addOrderTask(InputAddTask in){
+//	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
+//	public Result addOrderTask(InputAddTask in){
+//		Result res = new Result();
+//		if(StringUtils.isBlank(in.getOrderNo())){
+//			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+//			return res;
+//		}
+//		if (in.getOrderNo()!=null&&orderNewService.checkOrderMain(in)) {
+//			res.getError().add(buildError("订单主要任务已存在","订单主要任务已存在"));
+//			return res;
+//		}
+//		return res.data(orderNewService.addOrderTask(in));
+//	}
+
+	/**
+	 * 添加项目、新增项目(新版)
+	 */
+	@RequestMapping(value = "/AddOrderTaskNew",method = RequestMethod.POST)
+	public Result AddOrderTaskNew(@RequestBody InputAddTask in){
 		Result res = new Result();
 		if(StringUtils.isBlank(in.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));

+ 1 - 1
src/main/java/com/goafanti/order/enums/NewProjectTypeEnum.java

@@ -12,7 +12,7 @@ public enum NewProjectTypeEnum {
 	/** 未达立项条件 **/
 	OTHEN(0,"其他"),
 	/** 等待立项 **/
-	HT(1,"高新会员 "),
+	HT(1,"标准会员 "),
 	/** 已立项 **/
 	SIMPLE(2,"简单会员"),
 	/** 已结项 **/

+ 40 - 27
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -247,38 +247,51 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		InputAddTask t2=new InputAddTask();
 		BeanUtils.copyProperties(t,t2);
 		if (bp.getProjectType().equals(NewProjectTypeEnum.HT.getCode())){
-				//会员项目替换
-				List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName(null, 1);
-				for (BusinessProjectBo e : additionalDeductionList) {
-					if (!e.getId().equals(t.getCommodityId())) {
-						t2.setCommodityId(e.getId());
-						t2.setCommodityName(e.getBname());
-						t2.setMain(0);
-						t2.setCommodityPrice(new BigDecimal(0));
-						t2.setId(null);
-						addTTaskMember(t2);
-						addTaskMid(t2);
-					}
+			//先新增子项会员
+			addSonProject(t);
+			//会员项目替换
+			addFinanceOrTechnology(t2,1);
 
-				}
-		}
-		if (bp.getProjectType().equals(NewProjectTypeEnum.SIMPLE.getCode())){
-			List<BusinessProjectBo> list = businessProjectMapper.selectByFirstBName("简单会员", 2);
-			for (BusinessProjectBo e : list) {
-				if(!e.getId().equals(t.getCommodityId())){
-					t2.setCommodityId(e.getId());
-					t2.setCommodityName(e.getBname());
-					t2.setMain(0);
-					t2.setCommodityPrice(new BigDecimal(0));
-					t2.setId(null);
-					addTTaskMember(t2);
-					addTaskMid(t2);
-				}
-			}
 		}
 		return t;
 	}
 
+	/**
+	 *
+	 * @param t2 项目情况
+	 * @param type 1=标准会员,2=简单会员
+	 */
+	private void addFinanceOrTechnology(InputAddTask t2, Integer type) {
+		List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName(null, type);
+		for (BusinessProjectBo e : additionalDeductionList) {
+			if (!e.getId().equals(t2.getCommodityId())) {
+				t2.setCommodityId(e.getId());
+				t2.setCommodityName(e.getBname());
+				t2.setMain(0);
+				t2.setCommodityPrice(new BigDecimal(0));
+				t2.setId(null);
+				addTTaskMember(t2);
+				addTaskMid(t2);
+				addSonProject(t2);
+			}
+
+		}
+	}
+
+	private void addSonProject(InputAddTask t) {
+		List<InputAddTask> sonList = t.getSonList();
+		for (InputAddTask e : sonList) {
+			InputSonProject sonProject= new InputSonProject();
+			sonProject.setTid(t.getId());
+			sonProject.setServiceYear(t.getServiceYear());
+			sonProject.setTaskComment(t.getTaskComment());
+			sonProject.setHtMember(e.getHtMember());
+			sonProject.setAdditionalDeduction(e.getAdditionalDeduction());
+			sonProject.setRdAwardsubsidy(e.getRdAwardsubsidy());
+			orderProjectService.addMemberSonProject(sonProject);
+		}
+	}
+
 	private void addTTaskMember(InputAddTask t) {
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);