| 
					
				 | 
			
			
				@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.vo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fasterxml.jackson.annotation.JsonFormat; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ym.mec.biz.dal.enums.OrderTypeEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.commons.lang3.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.math.BigDecimal; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -104,15 +105,7 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void setOrderType(String orderType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.orderType = orderType; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public String getOrderTypeCode() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void setOrderTypeCode(String orderTypeCode) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.orderTypeCode = orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.orderType = OrderTypeEnum.valueOf(orderType).getMsg(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public BigDecimal getTotalAmount() { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -147,6 +140,14 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.totalRemitFee = totalRemitFee; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<StudentPaymentDetailVo> getList() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setList(List<StudentPaymentDetailVo> list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.list = list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Date getCreateTime() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return createTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -163,19 +164,19 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.payTime = payTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public String getTransNo() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public String getOrderTypeCode() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void setTransNo(String transNo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.transNo = transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setOrderTypeCode(String orderTypeCode) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.orderTypeCode = orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<StudentPaymentDetailVo> getList() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public String getTransNo() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void setList(List<StudentPaymentDetailVo> list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.list = list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setTransNo(String transNo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.transNo = transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |