[订单导出修改][修复]

mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java

@@ -5,6 +5,7 @@ import com.iformall.domain.po.WxCouponOrder;
 
 import javax.persistence.Id;
 import javax.persistence.Transient;
+import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -65,11 +66,11 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 	private Date expiredTime;
 	/*状态：0，待使用 1，已核销 2，已过期 3，已作废 **/
 
-	@Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"},orderNum = "4")
+	@Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"},orderNum = "5")
 	@io.swagger.annotations.ApiModelProperty(value = "状态：0，待使用 1，已核销 2，已过期 3，已作废 ", name = "couponOrderStatus")
 	private Integer couponOrderStatus;
 	/***/
-	@Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss",orderNum = "3")
+	@Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss",orderNum = "4")
 	@io.swagger.annotations.ApiModelProperty(value = "", name = "createDate")
 	private Date createDate;
 	/***/
@@ -87,7 +88,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 	@io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
 	private String title;
 	/*售价（适用于类型2，3，4，5）**/
-	@Excel(name="交易价格",width = 20,orderNum = "2")
 	@io.swagger.annotations.ApiModelProperty(value="售价（适用于类型2，3，4，5）",name="salePrice")
 	private Integer salePrice;
 	/*使用条件金额（适用于类型1,2,3,4）**/
@@ -107,6 +107,14 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 	@io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone")
 	private String cUserPhone;
 
+	@Transient
+	@Excel(name="交易价格",width = 20,orderNum = "3")
+	private String salePriceStr;
+
+	@Transient
+	@Excel(name="面额",width = 20,orderNum = "2")
+	private String priceStr;
+
 	public String getTenantId() {
 		return tenantId;
 	}
@@ -216,6 +224,30 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 		this.cUserPhone = cUserPhone;
 	}
 
+	public String getSalePriceStr() {
+		if(salePrice!=null) {
+			DecimalFormat df=new DecimalFormat("0.00");
+			salePriceStr = df.format((float)salePrice/100);
+		}
+		return salePriceStr;
+	}
+
+	public void setSalePriceStr(String salePriceStr) {
+		this.salePriceStr = salePriceStr;
+	}
+
+	public String getPriceStr() {
+		if(price!=null) {
+			DecimalFormat df=new DecimalFormat("0.00");
+			priceStr = df.format((float)price/100);
+		}
+		return priceStr;
+	}
+
+	public void setPriceStr(String priceStr) {
+		this.priceStr = priceStr;
+	}
+
 	public static enum Field {
 		Id_ASC("`id` ASC"), Id_DESC("`id` DESC"),
 		TenantId_ASC("`tenant_id` ASC"),