diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index ca8e45564..0498a5c02 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -187,11 +187,10 @@ public class WxCUserBasicInfoController extends BaseController List list = page.getList(); for(WxCouponOrder c:list) { WxCoupon coupon = wxCouponService.getById(c.getCouponId()); - + c.setCouponName(coupon.getTitle()); + c.setSalePrice(coupon.getPrice()); } } - - return new ResultData(Result.SUCCESS,"查询成功"); + return new ResultData(Result.SUCCESS,"查询成功",page); } - } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponOrder.java index 5a923c713..c94d2397e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponOrder.java @@ -1,12 +1,13 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.Date; import java.util.List; + import javax.persistence.Id; -import java.io.Serializable; +import javax.persistence.Table; +import javax.persistence.Transient; @Table(name = "wx_coupon_order") public class WxCouponOrder implements Serializable { @@ -71,8 +72,58 @@ public class WxCouponOrder implements Serializable { /*单券实际购买价格**/ @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") private Integer couponPrice; - - public String getTenantId() { + + @Transient + private String couponName; + @Transient + private String couponPriceStr; + + @Transient + private String salePriceStr; + @Transient + private Integer salePrice; + + public String getCouponPriceStr() { + if(couponPrice!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + couponPriceStr = df.format((float)couponPrice/100); + } + return couponPriceStr; + } + + public void setCouponPriceStr(String couponPriceStr) { + this.couponPriceStr = couponPriceStr; + } + + 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 Integer getSalePrice() { + return salePrice; + } + + public void setSalePrice(Integer salePrice) { + this.salePrice = salePrice; + } + + public String getCouponName() { + return couponName; + } + + public void setCouponName(String couponName) { + this.couponName = couponName; + } + + public String getTenantId() { return tenantId; }