From f3a55f03c3f62f12e8fcda5515dff561c5f27749 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 14 Mar 2023 17:17:09 +0800 Subject: [PATCH] //card --- .../java/com/iformall/controller/WxCardInfoController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java index 6787651b3..2353b195e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java @@ -90,7 +90,7 @@ public class WxCardInfoController extends BaseController { @GetMapping("detail") @ApiImplicitParams({ @ApiImplicitParam(name = "dynamicId", value = "动态码ID", dataType = "String", paramType = "query", required = true)}) - public ResultData detail(String dynamicId) { + public ResultData detail(String dynamicId,Integer type) { if (StringUtils.isBlank(dynamicId) || dynamicId.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); } @@ -111,9 +111,7 @@ public class WxCardInfoController extends BaseController { map.put("amount", cardInfo.getAmount()); map.put("remainAmount", cardInfo.getRemainingAmount()); map.put("cardType", cardInfo.getType()); - }else if(cardIdStr.contains(WxCouponOrderCVo.arg)){ - String[] decodeids = cardIdStr.split(WxCouponOrderCVo.arg); - cardIdStr = decodeids[0]; + }else if(type != null && type.intValue() == 0){ isECard = true; cardInfo = wxCardInfoService.getById(Long.parseLong(cardIdStr)); if (null == cardInfo) {