|
|
@@ -82,15 +82,14 @@ public class WxCardInfoController extends BaseController { |
|
|
boolean isPassword = couponPasswordService.isNeedPassword(password); |
|
|
boolean isPassword = couponPasswordService.isNeedPassword(password); |
|
|
|
|
|
|
|
|
cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password); |
|
|
cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password); |
|
|
|
|
|
map.put("cardId", couponPasswordId); |
|
|
if (null != cardInfo) { |
|
|
if (null != cardInfo) { |
|
|
map.put("cardId", cardInfo.getId()); |
|
|
|
|
|
map.put("amount", cardInfo.getAmount()); |
|
|
map.put("amount", cardInfo.getAmount()); |
|
|
map.put("remainAmount", cardInfo.getRemainingAmount()); |
|
|
map.put("remainAmount", cardInfo.getRemainingAmount()); |
|
|
map.put("cardType", cardInfo.getType()); |
|
|
map.put("cardType", cardInfo.getType()); |
|
|
map.put("isPassword",isPassword); |
|
|
map.put("isPassword",isPassword); |
|
|
}else { |
|
|
}else { |
|
|
//第一次刷卡的时候没有cardInfo |
|
|
//第一次刷卡的时候没有cardInfo |
|
|
map.put("cardId", couponPasswordId); |
|
|
|
|
|
map.put("amount", password.getPrice()); |
|
|
map.put("amount", password.getPrice()); |
|
|
map.put("remainAmount", password.getPrice()); |
|
|
map.put("remainAmount", password.getPrice()); |
|
|
map.put("cardType", EnumCardInfoType.CARD.getCode()); |
|
|
map.put("cardType", EnumCardInfoType.CARD.getCode()); |
|
|
|