Browse Source

会员子项目开发

anderx 3 years ago
parent
commit
9ed3263a9b

+ 3 - 0
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -46,4 +46,7 @@ public interface TChangeTaskMapper {
 
 
     TChangeTask selectBytid(Integer id);
+
+    void updateMemberByTid( @Param("sid")Integer sid,@Param("cid")Integer cid, @Param("type")Integer type, @Param("serviceLife")String serviceLife,
+                            @Param("serviceYear")String serviceYear, @Param("yearSum")Integer yearSum, @Param("contractTerm")String contractTerm);
 }

+ 29 - 3
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -317,7 +317,7 @@
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR},
        #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now(), #{item.serviceLife,jdbcType=VARCHAR},
       #{item.serviceYear,jdbcType=VARCHAR}, #{item.yearSum,jdbcType=INTEGER},#{item.contractTerm,jdbcType=VARCHAR},
-      #{declarationBatch,jdbcType=INTEGER},#{patentType,jdbcType=INTEGER})
+      #{item.declarationBatch,jdbcType=INTEGER},#{item.patentType,jdbcType=INTEGER})
     </foreach>
   </insert>
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
@@ -354,10 +354,36 @@
    <update id="deleteByTid">
   		delete from t_change_task where tid= #{tid};
   </update>
+  <update id="updateMemberByTid">
+    update t_change_task
+    <set>
+      <if test="type != null">
+        type= #{type},
+      </if>
+      <if test="serviceLife != null">
+        service_life= #{serviceLife},
+      </if>
+      <if test="serviceYear != null">
+        service_year= #{serviceYear},
+      </if>
+      <if test="yearSum != null">
+        year_sum= #{yearSum},
+      </if>
+      <if test="contractTerm != null">
+        contract_term= #{contractTerm},
+      </if>
+    </set>
+    where 1=1
+    <if test="cid !=null">
+      and cid= #{cid}
+    </if>
+    <if test="sid !=null">
+      and split_super= #{sid}
+    </if>
+  </update>
 
 
-
-    <select id="selectBySuper" resultType="com.goafanti.order.bo.TChangeTaskOut">
+  <select id="selectBySuper" resultType="com.goafanti.order.bo.TChangeTaskOut">
 	select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
   	a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,a.receiver_name receiverName,
 	a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper

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

@@ -523,4 +523,6 @@ public class OrderChangeApiController extends CertifyApiController {
 	}
 
 
+
+
 }

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

@@ -590,7 +590,7 @@ public class OrderProjectApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,null));
+		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,null,null));
 
 	}
 	/**
@@ -599,14 +599,16 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addMemberSonProject" ,method = RequestMethod.POST)
-	public Result addMemberSonProject(Integer tid,String serviceYear,String taskComment,Integer memberType){
+	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,"","订单编号"));
 			return res;
 		}
-		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,memberType));
+		return res.data(orderProjectService.addMemberSonProject( tid, serviceYear, taskComment,memberType, pictureUrl));
 
 	}
 
+
+
 }

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

@@ -214,4 +214,6 @@ public interface OrderNewService {
 	int updateSalesType(TOrderNew in);
 
 
+	int addTaskMid(Integer id,String commodityId, String orderNo);
+
 }

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

@@ -104,7 +104,7 @@ public interface OrderProjectService {
 	 * @param type 0首次新增 1会员新增
 	 * @return
 	 */
-    int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer type);
+    int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer type,String pictureUrl);
 
 	/**
 	 *

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

@@ -1041,7 +1041,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					}else if(t.getType()==2){
 						tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),2);
 						if (tt.getSplitStatus()==1) {
-							tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),2);
+
+							if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
+								tChangeTaskMapper.updateMemberByTid(tt.getTid(),t.getCid(),2,t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());
+							}else {
+								tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),2);
+							}
 						}else if(tt.getSplitStatus()==2) {
 								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2);
 						}

+ 12 - 8
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -206,31 +206,35 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
+		addTaskMid(t.getId(),t.getCommodityId(), order.getOrderNo());
+		return 1;
+	}
+	@Override
+	public int addTaskMid(Integer id,String commodityId, String orderNo) {
 		TTaskMid tm=new TTaskMid();
-		tm.setTid(t.getId());
+		tm.setTid(id);
 		//判断这个项目是不是高新复审
 		int highNewRetrial=0;
-		BusinessProject b=businessProjectMapper.selectByPrimaryKey(t.getCommodityId());
+		BusinessProject b=businessProjectMapper.selectByPrimaryKey(commodityId);
 		if (b.getType()==5){
-			int i=tOrderTaskMapper.getHighNewRetrial(order.getOrderNo());
+			int i=tOrderTaskMapper.getHighNewRetrial(orderNo);
 			if (i>0) {
 				highNewRetrial =1;
 			}
 			BusinessCategory bc =businessCategoryMapper.selectByPrimaryKey(b.getCid());
 			if (bc !=null && bc.getSort().equals(6)){
 				TOrderMid tom=new TOrderMid();
-				tom.setOrderNo(t.getOrderNo());
+				tom.setOrderNo(orderNo);
 				tom.setProjectType(1);
 				tOrderMidMapper.updateByOrderNo(tom);
 			}
 		}
 		tm.setHighNewRetrial(highNewRetrial);
-		TTaskMid dtails = tTaskMidMapper.getDtails(t.getId());
-		TTaskMid tTaskMid = new TTaskMid(t.getId(), new BigDecimal(0));
+		TTaskMid dtails = tTaskMidMapper.getDtails(id);
+		TTaskMid tTaskMid = new TTaskMid(id, new BigDecimal(0));
 		tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
 		tTaskMid.setDutyDep(dtails.getDutyDep());
-		tTaskMidMapper.insertSelective(tm);
-		return 1;
+		return tTaskMidMapper.insertSelective(tm);
 	}
 
 	@Override

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

@@ -1201,7 +1201,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType) {
+	public int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
 		Date date =new Date();
 		TOrderTask tOrderTask = tOrderTaskMapper.selectByPrimaryKey(tid);
 		tOrderTask.setSplitStatus(1);
@@ -1214,21 +1214,25 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (memberType!=null){
 			tOrderTask.setProcessStatus(1);
 			tOrderTask.setMemberType(memberType);
+			tOrderTask.setPictureUrl(pictureUrl);
 		}
 		Integer i=tOrderTaskMapper.getSplitCount(tid);
 		i++;
 		tOrderTask.setSplitId(i);
+		tOrderTask.setCommodityQuantity(1);
 		tOrderTaskMapper.insertSelective(tOrderTask);
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
 		if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
 			TTaskMember ttm=new TTaskMember();
-			ttm.setTid(t.getId());
+			ttm.setId(null);
+			ttm.setTid(tOrderTask.getId());
 			if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
 			if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
 			if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
+		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
 		return 1;
@@ -1334,4 +1338,5 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 
+
 }