winter 3 месяцев назад
Родитель
Сommit
7caa4b2893
2 измененных файлов: 4 добавлений и 0 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 3
- 0
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") @Excel(name = "卡号", width = 20, orderNum = "2")
@io.swagger.annotations.ApiModelProperty(value="卡号",name="cardId") @io.swagger.annotations.ApiModelProperty(value="卡号",name="cardId")
private Long 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") @Excel(name = "消费者", width = 20, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName")
private String onickName; private String onickName;


+ 1
- 0
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()) ; WxCardInfo cardInfo = cardInfoMap.get(_wcs.getCardId()) ;
if (null != cardInfo) { if (null != cardInfo) {
vo.setWxCardInfo(cardInfo); vo.setWxCardInfo(cardInfo);
vo.setCouponPasswordId(cardInfo.getCouponPasswordId());
} }
} }
// if (null != _wcs.getOrderId()) { // if (null != _wcs.getOrderId()) {


Загрузка…
Отмена
Сохранить