From 90ab097b39356b584db21351205640b1890f1d6f Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 8 Mar 2023 14:16:31 +0800 Subject: [PATCH] //push --- .../com/iformall/controller/WxCardInfoController.java | 11 +++++++++-- .../com/iformall/domain/vo/WxCardPriceTemplate.java | 2 +- .../service/impl/WxCouponPasswordServiceImpl.java | 2 +- 3 files changed, 11 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 f568e1065..e9431bda4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java @@ -79,18 +79,25 @@ public class WxCardInfoController extends BaseController { if (null == password) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未查询到卡:"+cardIdStr); } + boolean isPassword = false; + if(StringUtils.isNotBlank(password.getPayPassword())){ + isPassword = true; + } + cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password); 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("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()); + map.put("cardType", EnumCardInfoType.CARD.getCode()); + map.put("isPassword",isPassword); } } return new ResultData(map); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java index 9bc6a8c94..f4c7bb282 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java @@ -14,7 +14,7 @@ public class WxCardPriceTemplate implements Serializable { private static final long serialVersionUID = -2321650008236516884L; @NotNull - @Excel(name="卡密ID",width = 20,orderNum = "1") + @Excel(name="卡ID",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="ID",name="couponPasswordId") private String couponPasswordId; @NotNull 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 fbc70aaa3..36328e42d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -304,7 +304,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { newOne.setCouponId(couponId); newOne.setCouponShort(couponShortStr); newOne.setPassword(pwList.get(i)); - newOne.setPassword(AppUtils.getSortPwd()); + newOne.setPayPassword(AppUtils.getSortPwd()); newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode()); newOne.setCreateDate(curDate); newOne.setUpdateDate(curDate);