diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index 7d31f6ae2..f06d012d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -22,6 +22,9 @@ public class WxCardSpendVo extends WxCardSpend { @Excel(name = "卡号", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="卡号",name="cardId") private Long cardId; + @Excel(name = "绑定的实体卡卡号", width = 20, orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value="绑定的实体卡号",name="couponPasswordId") + private Long couponPasswordId; @Excel(name = "消费者", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") private String onickName; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 083545574..34f8ad063 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -616,6 +616,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxCardInfo cardInfo = cardInfoMap.get(_wcs.getCardId()) ; if (null != cardInfo) { vo.setWxCardInfo(cardInfo); + vo.setCouponPasswordId(cardInfo.getCouponPasswordId()); } } // if (null != _wcs.getOrderId()) {