From 9647e47e64842bdb5be35ffb96f935b465d519c8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 20 Sep 2019 16:49:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8D=A1=E5=AF=86=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 1 - .../main/java/com/iformall/common/ErrorCode.java | 4 ++-- .../impl/WxCouponPasswordServiceImpl.java | 16 ++++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 819465327..0c2f3d9d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -347,7 +347,6 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "卡券兑换码-导出数据") public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { wxCouponPassword.setTenantId(getTenantId()); - wxCouponPassword.setExpireDate(new Date()); if (wxCouponPassword.getCouponId() == null) { wxCouponPassword.setCouponId(0L); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 1e478befe..6beab9dc7 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -223,8 +223,8 @@ public enum ErrorCode{ * 卡密 */ COUPON_PASSWORD_NOT_FOUND(9501, "兑换码未找到"), - COUPON_PASSWORD_HAD_USED(9502, "兑换码已失效"), - COUPON_PASSWORD_IS_CANCELED(9503, "兑换码已失效"), + COUPON_PASSWORD_HAD_USED(9502, "兑换码已使用"), + COUPON_PASSWORD_IS_CANCELED(9503, "兑换码已作废"), /** * 微信 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index c557fc3ca..fb0aa99b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -47,10 +47,13 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public WxCouponPassword getByObj(WxCouponPassword obj) { + String errMsg = "兑换码已失效"; List pwdList = wxCouponPasswordMapper.findList(obj); if (pwdList.size() <= 0) { - throw new MallinkException(ErrorCode.COUPON_PASSWORD_NOT_FOUND); + logger.error(ErrorCode.COUPON_PASSWORD_NOT_FOUND.getMessage()); + throw new MallinkException(ErrorCode.COUPON_PASSWORD_NOT_FOUND.getCode(), errMsg); } + WxCouponPassword password = null; Integer errCode = EnumCouponPasswordStatus.INIT.getCode(); for( WxCouponPassword pwd: pwdList) { @@ -65,11 +68,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } if (password == null) { if (errCode.equals(EnumCouponPasswordStatus.USED.getCode())) { - logger.error("卡券已使用"); - throw new MallinkException(ErrorCode.COUPON_PASSWORD_HAD_USED); + logger.error(ErrorCode.COUPON_PASSWORD_HAD_USED.getMessage()); + throw new MallinkException(ErrorCode.COUPON_PASSWORD_HAD_USED.getCode(), errMsg); } else { - logger.error("卡券已过期或已作废"); - throw new MallinkException(ErrorCode.COUPON_PASSWORD_IS_CANCELED); + logger.error(ErrorCode.COUPON_PASSWORD_IS_CANCELED.getMessage()); + throw new MallinkException(ErrorCode.COUPON_PASSWORD_IS_CANCELED.getCode(), errMsg); } } return password; @@ -149,9 +152,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword) { List pwdList = wxCouponPasswordMapper.findAvaPasswordListByCouponId(couponPassword); - if (pwdList.isEmpty()) { - throw new MallinkException(ErrorCode.COUPON_PASSWORD_NOT_FOUND); - } excelService.exportExcel(pwdList, null, "兑换码", WxCouponPassword.class, "卡兑换码.xlsx", response, false); }