Просмотр исходного кода

[卡转赠][修改][跳转频道]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
4037b362e3
2 измененных файлов: 21 добавлений и 0 удалений
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java
  2. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java Просмотреть файл

@@ -59,6 +59,9 @@ public class WxCardCVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer")
private Integer supportTransfer; private Integer supportTransfer;


@io.swagger.annotations.ApiModelProperty(value = "couponChannelId", name = "couponChannelId")
private Long couponChannelId;

@Transient @Transient
protected List<Integer> statusS; protected List<Integer> statusS;


@@ -172,6 +175,14 @@ public class WxCardCVo extends WxCouponOrder {
this.supportTransfer = supportTransfer; this.supportTransfer = supportTransfer;
} }


public Long getCouponChannelId() {
return couponChannelId;
}

public void setCouponChannelId(Long couponChannelId) {
this.couponChannelId = couponChannelId;
}

public static enum Field { public static enum Field {
Id_ASC("co.`id` ASC"), Id_DESC("co.`id` DESC"), Id_ASC("co.`id` ASC"), Id_DESC("co.`id` DESC"),
TenantId_ASC("co.`tenant_id` ASC"), TenantId_DESC("co.`tenant_id` DESC"), TenantId_ASC("co.`tenant_id` ASC"), TenantId_DESC("co.`tenant_id` DESC"),


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -97,6 +97,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Autowired @Autowired
WxCardTransferInfoMapper wxCardTransferInfoMapper; WxCardTransferInfoMapper wxCardTransferInfoMapper;


@Autowired
WxCouponChannelMapper wxCouponChannelMapper;

@Override @Override
public PageInfo<WxCouponOrder> listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { public PageInfo<WxCouponOrder> listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record));
@@ -688,6 +691,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }


WxCardCVo cardCVo = wxCouponOrderMapper.findCardDetailOfCUser(Long.valueOf(couponOrderId)); WxCardCVo cardCVo = wxCouponOrderMapper.findCardDetailOfCUser(Long.valueOf(couponOrderId));
Long couponId = cardCVo.getCouponId();
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setCouponId(couponId);
List<WxCouponChannel> list = wxCouponChannelMapper.findList(wxCouponChannel);
if (!list.isEmpty()) {
cardCVo.setCouponChannelId(list.get(0).getId());
}
if (cardCVo == null) if (cardCVo == null)
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
return new ResultData(cardCVo); return new ResultData(cardCVo);


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