From 32253854f2ec1d73da200b0e5c3e8df656700db3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 30 Nov 2018 19:03:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BD=9C=E5=BA=9F=E5=88=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponController.java | 24 +++++++++++-------- .../java/com/iformall/domain/po/WxCoupon.java | 3 +-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index ba930fabc..6081ce3e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -120,11 +120,13 @@ public class WxCouponController extends BaseController { } wxCoupon.setTenantId(getUser().getTenantId()); wxCoupon.setChannels(""); - if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { - wxCoupon.setValidStartDate(null); - wxCoupon.setValidEndDate(null); - } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { - wxCoupon.setValidDays(null); + if (wxCoupon.getValidType() != null) { + if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { + wxCoupon.setValidStartDate(null); + wxCoupon.setValidEndDate(null); + } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { + wxCoupon.setValidDays(null); + } } Long id = wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(id); @@ -150,11 +152,13 @@ public class WxCouponController extends BaseController { String[] arys = wxCoupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } - if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { - wxCoupon.setValidStartDate(null); - wxCoupon.setValidEndDate(null); - } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { - wxCoupon.setValidDays(null); + if (wxCoupon.getValidType() != null) { + if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { + wxCoupon.setValidStartDate(null); + wxCoupon.setValidEndDate(null); + } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { + wxCoupon.setValidDays(null); + } } return wxCouponService.updateCoupon(wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 9635d150d..4bdd9a4ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -289,8 +289,7 @@ public class WxCoupon implements Serializable { } public String getSalePriceStr() { if(salePrice!=null) { - DecimalFormat df=new DecimalFormat("0.00"); - salePriceStr = df.format((float)salePrice/100); + salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); } return salePriceStr; } From e9726dc2dedb1c05b5e3c4287918982dc0950618 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 30 Nov 2018 19:08:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:C=E7=AB=AF?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxCouponCVo.java | 67 +++++++++---------- .../iformall/domain/vo/WxCouponChannelVo.java | 11 ++- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 1711dcfc1..0bbade3b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxCoupon; import javax.persistence.Id; import javax.persistence.Transient; import java.io.Serializable; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.Date; import java.util.List; @@ -364,41 +365,6 @@ public class WxCouponCVo implements Serializable { public void setBusiness(String _business) { business = _business; } - 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 getUsePriceStr() { - if(usePrice!=null) { - DecimalFormat df=new DecimalFormat("0.00"); - usePriceStr = df.format((float)usePrice/100); - } - return usePriceStr; - } - - public void setUsePriceStr(String usePriceStr) { - this.usePriceStr = usePriceStr; - } - - 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 String getBuildingName() {return buildingName; } @@ -455,7 +421,38 @@ public class WxCouponCVo implements Serializable { public void setMerchantStatus(Integer status) { this.merchantStatus = status; } + public String getSalePriceStr() { + if(salePrice!=null) { + salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); + } + return salePriceStr; + } + + public void setSalePriceStr(String salePriceStr) { + this.salePriceStr = salePriceStr; + } + + public String getUsePriceStr() { + if(usePrice!=null) { + usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString(); + } + return usePriceStr; + } + + public void setUsePriceStr(String usePriceStr) { + this.usePriceStr = usePriceStr; + } + + public String getPriceStr() { + if(price!=null) { + priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); + } + return priceStr; + } + public void setPriceStr(String priceStr) { + this.priceStr = priceStr; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 76192daef..fb1ef3c18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxMerchant; import javax.persistence.Transient; import java.io.Serializable; +import java.math.BigDecimal; import java.text.DecimalFormat; /** @@ -165,8 +166,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public String getSalePriceStr() { if(salePrice!=null) { - DecimalFormat df=new DecimalFormat("0.00"); - salePriceStr = df.format((float)salePrice/100); + salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); } return salePriceStr; } @@ -177,8 +177,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public String getUsePriceStr() { if(usePrice!=null) { - DecimalFormat df=new DecimalFormat("0.00"); - usePriceStr = df.format((float)usePrice/100); + usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString(); } return usePriceStr; } @@ -187,11 +186,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { this.usePriceStr = usePriceStr; } - public String getPriceStr() { if(price!=null) { - DecimalFormat df=new DecimalFormat("0.00"); - priceStr = df.format((float)price/100); + priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); } return priceStr; }