Merge branch 'appear'

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

@@ -72,4 +72,10 @@ public class RenewalView {
 
     @DbIgnore
     private GoodsDonViews goodsDonViews;
+
+    /**
+     * 最后购买奈飞的时候
+     */
+    @DbIgnore
+    private Date lastTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -1,6 +1,7 @@
 package com.cyksj.web.controller.group;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
@@ -44,6 +45,19 @@ public class GroupRelationController {
     public Result<List<RenewalView>> get(Boolean isLoginPopularize) {
         long userId = StpUserUtil.getLoginIdAsLong();
         List<RenewalView> list = groupRelationFrontService.getMyTicket(userId, isLoginPopularize);
+        list.forEach(data->{
+            if (data.getGoodsId() == 1) {
+                OrderDon last = orderDonService.getOne(Wrappers.lambdaQuery(OrderDon.class)
+                        .eq(OrderDon::getGoodsId, 1)
+                        .notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
+                        .orderByAsc(OrderDon::getId)
+                        .select(OrderDon::getCreatedTime)
+                        .last("limit 1"));
+                if (last != null) {
+                    data.setLastTime(last.getCreatedTime());
+                }
+            }
+        });
         return GatewayResponse.SUCCESS.newBuilder().toResult(list);
     }