|  |  | @ -12,9 +12,12 @@ public class GasOrderModel { | 
			
		
	
		
		
			
				
					
					|  |  |  |     private Long orderId; |  |  |  |     private Long orderId; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private String orderNo; |  |  |  |     private String orderNo; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private String gasOrderNo; |  |  |  |     private String gasOrderNo; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     private String memDiscountName; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private Integer payType; |  |  |  |     private Integer payType; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private BigDecimal totalPrice; |  |  |  |     private BigDecimal totalPrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private BigDecimal deductionPrice; |  |  |  |     private BigDecimal deductionPrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     private BigDecimal payablePrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     private BigDecimal payGold; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private BigDecimal payRealPrice; |  |  |  |     private BigDecimal payRealPrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private Integer status; |  |  |  |     private Integer status; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private String merPhone; |  |  |  |     private String merPhone; | 
			
		
	
	
		
		
			
				
					|  |  | @ -39,6 +42,30 @@ public class GasOrderModel { | 
			
		
	
		
		
			
				
					
					|  |  |  |     private Boolean printStatus; |  |  |  |     private Boolean printStatus; | 
			
		
	
		
		
			
				
					
					|  |  |  |     private Integer printNum; |  |  |  |     private Integer printNum; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public BigDecimal getPayablePrice() { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         return payablePrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public void setPayablePrice(BigDecimal payablePrice) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         this.payablePrice = payablePrice; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public BigDecimal getPayGold() { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         return payGold; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public void setPayGold(BigDecimal payGold) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         this.payGold = payGold; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public String getMemDiscountName() { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         return memDiscountName; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     public void setMemDiscountName(String memDiscountName) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         this.memDiscountName = memDiscountName; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public String getGasStaffName() { |  |  |  |     public String getGasStaffName() { | 
			
		
	
		
		
			
				
					
					|  |  |  |         return gasStaffName; |  |  |  |         return gasStaffName; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
	
		
		
			
				
					|  |  | 
 |