| 
					
				 | 
			
			
				@@ -2,7 +2,6 @@ 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; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -29,11 +28,10 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 订单类型-枚举的code 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private String orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 总金额 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private String totalAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private BigDecimal totalAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 现金 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -106,14 +104,22 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void setOrderType(String orderType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.orderType = OrderTypeEnum.valueOf(orderType).getMsg(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.orderType = orderType; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public String getOrderTypeCode() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setOrderTypeCode(String orderTypeCode) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.orderTypeCode = orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public String getTotalAmount() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public BigDecimal getTotalAmount() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return totalAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void setTotalAmount(String totalAmount) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setTotalAmount(BigDecimal totalAmount) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.totalAmount = totalAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -141,14 +147,6 @@ 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; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -165,14 +163,6 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.payTime = payTime; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public String getOrderTypeCode() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void setOrderTypeCode(String orderTypeCode) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.orderTypeCode = orderTypeCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public String getTransNo() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -180,4 +170,12 @@ public class StudentPaymentOrderVo { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void setTransNo(String transNo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.transNo = transNo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<StudentPaymentDetailVo> getList() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void setList(List<StudentPaymentDetailVo> list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.list = list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |