Browse Source

订单变更最新更新

anderx 6 years ago
parent
commit
2916e07d9c

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -104,4 +104,6 @@ public interface OrderExamineMapper {
 	List<OrderExamineBo> selectByOrderNo(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
 	int selectByOrderNoAndAid(@Param("orderNo") String orderNo,@Param("aid") String aid);
+
+	void updateByOrderNo(@Param("orderNo") String orderNo,@Param("status")Integer status);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -732,6 +732,9 @@ select
 	<if test="complete ==2 and processState == 8">
 	 and a.process_state = 8  and   (a.status = 4 or a.status = 2)
 	</if>
+	<if test="complete ==3">
+	 and   a.status = 2
+	</if>
 	order by a.create_time 
 	<if test="page_sql != null">
 			${page_sql}
@@ -806,6 +809,9 @@ select
 	<if test="complete ==2 and processState == 8">
 	 and a.process_state = 8  and  (a.status = 4 or a.status = 2)
 	</if>
+		<if test="complete ==3">
+	 and   a.status = 2
+	</if>
 	</select>
 	<update id="addRefundInvoice" >
 	update  new_order_change

+ 7 - 0
src/main/java/com/goafanti/common/mapper/OrderExamineMapper.xml

@@ -322,4 +322,11 @@
   select ifnull(min(status),2) from order_examine
 		where order_no= #{orderNo} and aid= #{aid}
   </select>
+  <update id="updateByOrderNo">
+  update order_examine set status=0
+    where order_no=#{orderNo} 
+    <if test="status != null">
+    and status=#{status}
+    </if>
+  </update>
 </mapper>

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

@@ -165,7 +165,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setStatus(2);
 						}
 				}else {
-					if(nb.getProcessState()==8) {//董事长项目变更通过
+					if(nb.getProcessState()==7) {
+						nb.setProcessState(nb.getProcessState()+1);
+						}else if(nb.getProcessState()==8) {//董事长项目变更通过
 						nb.setStatus(2);
 						}
 				}
@@ -210,6 +212,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}else {
 			nb.setProcessState(rejectState);
 			nb.setStatus(3);//订单变更设置为驳回
+			//如果驳回到技术经理之前则将审核表中状态跳回
+			if(rejectState==3) {
+				orderExamineMapper.updateByOrderNo(orderNo,1);
+			}else if (rejectState<3) {
+				orderExamineMapper.updateByOrderNo(orderNo,null);
+			}
+			
 		}
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());