zoujiajian преди 3 години
родител
ревизия
9de97a27a2

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -62,6 +62,10 @@ public class RenewalView {
     @DbField("g.category")
     private Integer category;
 
+    @DbField("g.type")
+    @JsonIgnore
+    private Integer goodsType;
+
     /**
      * 二级分类
      * 虚物品 1邀请制 2非邀请制

+ 5 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -80,9 +80,13 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, ticket.getGoodsId()).build());
 				views.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, views.getId()).build()));
 				views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true).build()));
-
 				ticket.setGoodsDonViews(views);
 			}
+			if (ticket.getGoodsType() == 1 && ticket.getSecondType() == 2 && ticket.getMonths() < 300 && ticket.getExpiryTime() != null) {
+				String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime());
+
+				ticket.setRemainDays();
+			}
 			return true;
 		}).collect(Collectors.toList());
 		return collect;