From d1f842c6de5df20d0900eba12ae03e16660d7a1f Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Sun, 12 Mar 2023 11:45:17 +0800 Subject: [PATCH] fix card --- .../java/com/iformall/controller/WxCardInfoController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java index 1efb77fb4..cc6a4c892 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java @@ -82,15 +82,14 @@ public class WxCardInfoController extends BaseController { boolean isPassword = couponPasswordService.isNeedPassword(password); cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password); + map.put("cardId", couponPasswordId); if (null != cardInfo) { - map.put("cardId", cardInfo.getId()); map.put("amount", cardInfo.getAmount()); map.put("remainAmount", cardInfo.getRemainingAmount()); map.put("cardType", cardInfo.getType()); map.put("isPassword",isPassword); }else { //第一次刷卡的时候没有cardInfo - map.put("cardId", couponPasswordId); map.put("amount", password.getPrice()); map.put("remainAmount", password.getPrice()); map.put("cardType", EnumCardInfoType.CARD.getCode());