Ver a proveniência

[卡密][修改]:卡密错误提示

release_toaliyun_real
Stormeye Wu há 6 anos
ascendente
cometimento
9647e47e64
3 ficheiros alterados com 10 adições e 11 eliminações
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +8
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Ver ficheiro

@@ -347,7 +347,6 @@ public class WxCouponController extends BaseController {
@SystemControllerLog(description = "卡券兑换码-导出数据") @SystemControllerLog(description = "卡券兑换码-导出数据")
public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) {
wxCouponPassword.setTenantId(getTenantId()); wxCouponPassword.setTenantId(getTenantId());
wxCouponPassword.setExpireDate(new Date());
if (wxCouponPassword.getCouponId() == null) { if (wxCouponPassword.getCouponId() == null) {
wxCouponPassword.setCouponId(0L); wxCouponPassword.setCouponId(0L);
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Ver ficheiro

@@ -223,8 +223,8 @@ public enum ErrorCode{
* 卡密 * 卡密
*/ */
COUPON_PASSWORD_NOT_FOUND(9501, "兑换码未找到"), 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, "兑换码已作废"),


/** /**
* 微信 * 微信


+ 8
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Ver ficheiro

@@ -47,10 +47,13 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {


@Override @Override
public WxCouponPassword getByObj(WxCouponPassword obj) { public WxCouponPassword getByObj(WxCouponPassword obj) {
String errMsg = "兑换码已失效";
List<WxCouponPassword> pwdList = wxCouponPasswordMapper.findList(obj); List<WxCouponPassword> pwdList = wxCouponPasswordMapper.findList(obj);
if (pwdList.size() <= 0) { 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; WxCouponPassword password = null;
Integer errCode = EnumCouponPasswordStatus.INIT.getCode(); Integer errCode = EnumCouponPasswordStatus.INIT.getCode();
for( WxCouponPassword pwd: pwdList) { for( WxCouponPassword pwd: pwdList) {
@@ -65,11 +68,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
} }
if (password == null) { if (password == null) {
if (errCode.equals(EnumCouponPasswordStatus.USED.getCode())) { 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 { } 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; return password;
@@ -149,9 +152,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
@Override @Override
public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword) { public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword) {
List<WxCouponPassword> pwdList = wxCouponPasswordMapper.findAvaPasswordListByCouponId(couponPassword); List<WxCouponPassword> pwdList = wxCouponPasswordMapper.findAvaPasswordListByCouponId(couponPassword);
if (pwdList.isEmpty()) {
throw new MallinkException(ErrorCode.COUPON_PASSWORD_NOT_FOUND);
}
excelService.exportExcel(pwdList, null, "兑换码", WxCouponPassword.class, "卡兑换码.xlsx", response, false); excelService.exportExcel(pwdList, null, "兑换码", WxCouponPassword.class, "卡兑换码.xlsx", response, false);


} }


Carregando…
Cancelar
Guardar