发票改版

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/InvoiceCompanyEnum.java

+package com.ctrip.fun.common.vo.basic;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum InvoiceCompanyEnum {
+	
+	GL(1, "上海爱玩国际旅行社有限公司"), HZ(2, "上海爱玩慧智体育服务有限公司"), QD(3, "上海球道奇观体育服务有限公司");
+
+    private Integer value;
+    private String msg;
+    private static Map<Integer, InvoiceCompanyEnum> map = new HashMap<Integer, InvoiceCompanyEnum>();
+
+    static {
+        for (InvoiceCompanyEnum it : InvoiceCompanyEnum.values()) {
+            map.put(it.value, it);
+        }
+    }
+
+    InvoiceCompanyEnum(Integer value, String msg) {
+        this.value = value;
+        this.msg = msg;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static InvoiceCompanyEnum valueOf(int value) {
+        return map.get(value);
+    }
+    
+    public static  InvoiceCompanyEnum getEnumValues(Integer key){
+    	InvoiceCompanyEnum[] payFormEnums = InvoiceCompanyEnum.values();
+        for (InvoiceCompanyEnum typeEnum : payFormEnums) {
+            if(typeEnum.getValue().equals(key)){
+                return typeEnum;
+            }
+        }
+        return null;
+    }
+
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/InvoiceOrderInfoBean.java

 package com.ctrip.fun.common.vo.basic;
 
+import java.math.BigDecimal;
+
 public class InvoiceOrderInfoBean {
 	private Integer id;
 	private String orderNo;
 	private String courseName;
 	private String amount;
+	private String msg;
+	//成本
+	private BigDecimal basePrice;
+	//开票金额
+	private BigDecimal costPrice;
+	
+	private String companyIndex;
 	
 	public Integer getId() {
 		return id;
@@ -33,5 +42,30 @@ public class InvoiceOrderInfoBean {
 	public void setAmount(String amount) {
 		this.amount = amount;
 	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public BigDecimal getBasePrice() {
+		return basePrice;
+	}
+	public void setBasePrice(BigDecimal basePrice) {
+		this.basePrice = basePrice;
+	}
+	public BigDecimal getCostPrice() {
+		return costPrice;
+	}
+	public void setCostPrice(BigDecimal costPrice) {
+		this.costPrice = costPrice;
+	}
+	public String getCompanyIndex() {
+		return companyIndex;
+	}
+
+	public void setCompanyIndex(String companyIndex) {
+		this.companyIndex = companyIndex;
+	}
 	
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/InvoiceRequestBean.java

@@ -61,6 +61,12 @@ public class InvoiceRequestBean {
     //到付，付款信息
     private String  payInfo; 
     
+    //开票公司
+    private String  billingCompany;
+    
+    private String nickName;
+    
+    private String companyIndex;
     
 	public InvoiceRequestBean() {
 		
@@ -69,7 +75,7 @@ public class InvoiceRequestBean {
 	public InvoiceRequestBean(String costOfDepart, String invoiceTitle, String taxIdNum,
 			String contactName, String contactTel, String contactAddress,
 			String invoiceRemark, String expressNo, String sendTime,
-			String refusedReason) {
+			String refusedReason,String nickName,String billingCompany,String companyIndex) {
 		super();
 		this.costOfDepart = costOfDepart;
 		this.invoiceTitle = invoiceTitle;
@@ -81,6 +87,9 @@ public class InvoiceRequestBean {
 		this.expressNo = expressNo;
 		this.sendTime = sendTime;
 		this.refusedReason = refusedReason;
+		this.nickName = nickName;
+		this.billingCompany = billingCompany;
+		this.companyIndex = companyIndex;
 	}
     
 
@@ -236,5 +245,30 @@ public class InvoiceRequestBean {
 	public void setPayInfo(String payInfo) {
 		this.payInfo = payInfo;
 	}
+	
+	public String getNickName() {
+		return nickName;
+	}
 
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+
+	public String getBillingCompany() {
+		return billingCompany;
+	}
+
+	public void setBillingCompany(String billingCompany) {
+		this.billingCompany = billingCompany;
+	}
+	
+	public String getCompanyIndex() {
+		return companyIndex;
+	}
+
+	public void setCompanyIndex(String companyIndex) {
+		this.companyIndex = companyIndex;
+	}
+	
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderGroupBean.java

+package com.ctrip.fun.common.vo.order;
+
+import java.math.BigDecimal;
+
+public class OrderGroupBean {
+	
+	private Long orderId;
+
+	  /**
+     * 订单编号
+     */
+    private long orderNo;
+    
+    /**
+     * 实付金额
+     */
+    private BigDecimal actualAmount;
+    
+    /**
+     * 银行卡退款金额
+     */
+    private BigDecimal refundAmount;
+    
+    /**
+     * 抵用卷退款金额
+     */
+    private BigDecimal voucherRefundAmount;
+    
+    
+    private int orderCategory;
+    
+    private BigDecimal prePayCardRefundAmount;
+    
+    private BigDecimal voucherAmount;
+    
+    private BigDecimal floorPrice;
+    
+    private int quantity;
+    // 产品类型 1-套票 2-培训产品 3-超级会员 4-实物
+    private Integer activityType;
+    
+	private BigDecimal realPrice;
+	
+	private BigDecimal prePayCardAmount;
+
+	private Integer invoiceId;
+	
+	private BigDecimal invoiceAmount;
+	
+	private String orderName;
+	
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public long getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(long orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public BigDecimal getActualAmount() {
+		return actualAmount;
+	}
+
+	public void setActualAmount(BigDecimal actualAmount) {
+		this.actualAmount = actualAmount;
+	}
+
+	public BigDecimal getRefundAmount() {
+		return refundAmount;
+	}
+
+	public void setRefundAmount(BigDecimal refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+
+	public BigDecimal getVoucherRefundAmount() {
+		return voucherRefundAmount;
+	}
+
+	public void setVoucherRefundAmount(BigDecimal voucherRefundAmount) {
+		this.voucherRefundAmount = voucherRefundAmount;
+	}
+
+	public int getOrderCategory() {
+		return orderCategory;
+	}
+
+	public void setOrderCategory(int orderCategory) {
+		this.orderCategory = orderCategory;
+	}
+
+	public BigDecimal getPrePayCardRefundAmount() {
+		return prePayCardRefundAmount;
+	}
+
+	public void setPrePayCardRefundAmount(BigDecimal prePayCardRefundAmount) {
+		this.prePayCardRefundAmount = prePayCardRefundAmount;
+	}
+
+	public BigDecimal getVoucherAmount() {
+		return voucherAmount;
+	}
+
+	public void setVoucherAmount(BigDecimal voucherAmount) {
+		this.voucherAmount = voucherAmount;
+	}
+
+	public int getQuantity() {
+		return quantity;
+	}
+
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+
+	public Integer getActivityType() {
+		return activityType;
+	}
+
+	public void setActivityType(Integer activityType) {
+		this.activityType = activityType;
+	}
+
+	public BigDecimal getRealPrice() {
+		return realPrice;
+	}
+
+	public void setRealPrice(BigDecimal realPrice) {
+		this.realPrice = realPrice;
+	}
+
+	public Integer getInvoiceId() {
+		return invoiceId;
+	}
+
+	public void setInvoiceId(Integer invoiceId) {
+		this.invoiceId = invoiceId;
+	}
+
+	public BigDecimal getFloorPrice() {
+		return floorPrice;
+	}
+
+	public void setFloorPrice(BigDecimal floorPrice) {
+		this.floorPrice = floorPrice;
+	}
+
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	public BigDecimal getPrePayCardAmount() {
+		return prePayCardAmount;
+	}
+
+	public void setPrePayCardAmount(BigDecimal prePayCardAmount) {
+		this.prePayCardAmount = prePayCardAmount;
+	}
+
+	public String getOrderName() {
+		return orderName;
+	}
+
+	public void setOrderName(String orderName) {
+		this.orderName = orderName;
+	}
+
+	
+    
+    
+    
+    
+    
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/InvoiceStatusEnum.java

@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum InvoiceStatusEnum {
-	GM(1, "高尔夫上海总部"), HR(2, "人事行政部"), FINANCE(3, "财务部"),JISHU(4, "技术部"),CLUB(5,"上海玩家俱乐部"),BJGOLF(6,"高尔夫北京分部"),GZGOLF(7,"高尔夫广州分部");
+	GM(1, "高尔夫销售"), HR(2, "高尔夫运营"), FINANCE(3, "玩家大悦城 "),JISHU(4, "玩家大都会"),CLUB(5,"玩家北外滩 "),BJGOLF(6,"玩家金茂店"),GZGOLF(7,"广州分公司");
 
 	    private int value;
 	    private String msg;