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; }