记得上下班打卡 | git大法好,push需谨慎

Commit c5521639 authored by 张国柄's avatar 张国柄

~api:藏品详情+受赠人判断+转赠人UID;

parent c3e164af
...@@ -76,6 +76,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable { ...@@ -76,6 +76,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
@ApiModelProperty(position = 33, value = "转赠过期时间[yyyy-MM-dd HH:mm:ss],发生转赠时有效") @ApiModelProperty(position = 33, value = "转赠过期时间[yyyy-MM-dd HH:mm:ss],发生转赠时有效")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime transferExpireTime; private LocalDateTime transferExpireTime;
@ApiModelProperty(position = 34, value = "转赠人UID,发生转赠且受赠人查取详情时有效")
private String transferUid;
private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo(); private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
......
...@@ -220,6 +220,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr ...@@ -220,6 +220,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
if (transferState.equals(GoblinStatusConst.TransferState.WAITING.name()) && null != artworkInfoVo.getTransferTime()) { if (transferState.equals(GoblinStatusConst.TransferState.WAITING.name()) && null != artworkInfoVo.getTransferTime()) {
artworkInfoVo.setTransferExpireTime(artworkInfoVo.getTransferTime().plusDays(1)); artworkInfoVo.setTransferExpireTime(artworkInfoVo.getTransferTime().plusDays(1));
} }
if (uid.equals(userDigitalArtworkVo.getReceiverUid())) {// 受赠人查取详情返回转赠人UID,用于前端查取转赠人身份信息使用
artworkInfoVo.setTransferUid(userDigitalArtworkVo.getUid());
}
} }
if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && !transferFlg) {// 非盲盒 & 已上链 & 非转赠(转赠中、已转赠) if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && !transferFlg) {// 非盲盒 & 已上链 & 非转赠(转赠中、已转赠)
artworkInfoVo.setMaterialType(goodsSkuInfoVo.getMaterialType()); artworkInfoVo.setMaterialType(goodsSkuInfoVo.getMaterialType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment