From 32253854f2ec1d73da200b0e5c3e8df656700db3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 30 Nov 2018 19:03:35 +0800 Subject: [PATCH] =?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; }