Merge remote-tracking branch 'origin/system_fee' into system_fee

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -260,6 +260,15 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			throw new BizException("学员信息不存在");
 		}
 		
+		//查询原定的是否已处理
+		StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.get(studentPaymentOrder.getId());
+		if(orignStudentPaymentOrder == null){
+			return false;
+		}
+		if(orignStudentPaymentOrder.getStatus() != DealStatusEnum.ING || orignStudentPaymentOrder.getStatus() != DealStatusEnum.WAIT_PAY){
+			return false;
+		}
+		
 		Date nowDate = new Date();
 		// 更新订单信息
 		studentPaymentOrder.setUpdateTime(nowDate);