| @@ -111,7 +111,19 @@ public class WxCardInfoController extends BaseController { | |||||
| 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()); | ||||
| }else { | |||||
| }else if(cardIdStr.contains(WxCouponOrderCVo.arg)){ | |||||
| String[] decodeids = cardIdStr.split(WxCouponOrderCVo.arg); | |||||
| cardIdStr = decodeids[0]; | |||||
| isECard = true; | |||||
| cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr)); | |||||
| if (null == cardInfo) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未查询到卡:"+cardIdStr); | |||||
| } | |||||
| map.put("cardId", cardInfo.getId()); | |||||
| map.put("amount", cardInfo.getAmount()); | |||||
| map.put("remainAmount", cardInfo.getRemainingAmount()); | |||||
| map.put("cardType", cardInfo.getType()); | |||||
| }else{ | |||||
| Long couponPasswordId = Long.parseLong(cardIdStr); | Long couponPasswordId = Long.parseLong(cardIdStr); | ||||
| //实体卡 | //实体卡 | ||||
| WxCouponPassword password = couponPasswordService.getById(couponPasswordId); | WxCouponPassword password = couponPasswordService.getById(couponPasswordId); | ||||