From af6a315efdc4df3bd128caab8559a9a976627555 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 3 Apr 2023 18:30:23 +0800 Subject: [PATCH] fix card --- .../controller/market/WxCouponPasswordController.java | 9 +++++++-- .../service/impl/WxCouponPasswordServiceImpl.java | 11 ++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index cfd6cc61f..6a791da2e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -20,6 +20,7 @@ import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.domain.vo.WxCouponPasswordVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; +import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCouponPasswordService; import com.iformall.utils.Constant; @@ -66,6 +67,8 @@ public class WxCouponPasswordController extends BaseController { private AsyncTask asyncTask; @Autowired private String fmUploadDir; + @Autowired + private WxCardInfoService wxCardInfoService; @ApiOperation("分页列表接口") @GetMapping("/list") @@ -203,8 +206,10 @@ public class WxCouponPasswordController extends BaseController { if (couponPassword.getIsStop().intValue() == EnumYesOrNo.YES.getCode().intValue() ) { return new ResultData(ResultData.ERROR, "已停用,不能设置。"); } - if (couponPassword.getPrice() > 0 ) { - return new ResultData(ResultData.ERROR, "已设置面额,不能再次设置面额。"); + //已经绑定了的不能设置 + WxCardInfo cardInfo = wxCardInfoService.getByCouponPasswordId(wxCouponPassword.getId(), wxCouponPassword); + if (null != cardInfo) { + return new ResultData(ResultData.ERROR, "卡已绑定,不能再次设置面额。"); } wxCouponPasswordService.setPrice(wxCouponPassword); return new ResultData(); 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 990cad516..6de41ac17 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -23,6 +23,7 @@ import com.iformall.mapper.WxCouponPasswordMapper; import com.iformall.service.ExcelService; import com.iformall.service.SysConfigService; import com.iformall.service.WxCUserBasicInfoService; +import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCouponPasswordService; import com.iformall.utils.sign.AppUtils; @@ -72,6 +73,10 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Autowired SysConfigService sysConfigService; + + @Lazy + @Autowired + WxCardInfoService wxCardInfoService; @Override public PageInfo listAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize) { @@ -337,7 +342,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public Integer setPrice(WxCouponPassword wxCouponPassword) { - return wxCouponPasswordMapper.setPrice(wxCouponPassword); + WxCardInfo cardInfo = wxCardInfoService.getByCouponPasswordId(wxCouponPassword.getId(), wxCouponPassword); + if (null == cardInfo) { + return wxCouponPasswordMapper.setPrice(wxCouponPassword); + } + return 0; } @Override