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

Commit 98e09578 authored by 张国柄's avatar 张国柄

~api:藏品详情:转赠过期时间设置+条件;

parent 43ef60f7
...@@ -208,11 +208,14 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr ...@@ -208,11 +208,14 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic()); artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
artworkInfoVo.setRouteType(goodsSkuInfoVo.getRouteType()); artworkInfoVo.setRouteType(goodsSkuInfoVo.getRouteType());
boolean transferFlg = StringUtils.isNotEmpty(userDigitalArtworkVo.getTransferState()); String transferState = userDigitalArtworkVo.getTransferState();
boolean transferFlg = StringUtils.isNotEmpty(transferState);
if (transferFlg) {// 发生转赠 if (transferFlg) {// 发生转赠
artworkInfoVo.setTransferTime(userDigitalArtworkVo.getTransferAt()); artworkInfoVo.setTransferTime(userDigitalArtworkVo.getTransferAt());
if (transferState.equals(GoblinStatusConst.TransferState.PENDING.name()) && null != userDigitalArtworkVo.getTransferAt()) {
artworkInfoVo.setTransferExpireTime(userDigitalArtworkVo.getTransferAt().plusDays(1)); artworkInfoVo.setTransferExpireTime(userDigitalArtworkVo.getTransferAt().plusDays(1));
} }
}
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());
artworkInfoVo.setMaterialUrl(goodsSkuInfoVo.getMaterialUrl()); artworkInfoVo.setMaterialUrl(goodsSkuInfoVo.getMaterialUrl());
......
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