fix 账号今日全部到期;需要修改密码平台展示

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

@@ -17,7 +17,9 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "account a left join goods_don g on a.goods_id = g.id " +
         "left join groups_trips gt on gt.account_id = a.id " +
-        "left join goods_don_sku gdk on gdk.id = gt.sku_id")
+        "left join groups_relation gr on gr.groups_id = gt.id " +
+        "left join goods_don_sku gdk on gdk.id = gt.sku_id",
+        groupBy = "a.id,g.id,g.title,a.account,a.password,a.start_time,a.expiry_time,a.amount,a.cn_account,a.us_account,gt.id,a.remark,gdk.spec_val")
 public class AccountView {
 
     @DbField("a.id")
@@ -80,7 +82,9 @@ public class AccountView {
     @DbField("gdk.spec_val")
     private String specVal;
 
-    @DbField("select count(ur.id) from user_ticket_cleared_record ur where ur.account_id = a.id")
+    @DbField("select count(ur.id) from user_ticket_cleared_record ur where ur.account_id = a.id and deleted is true")
     private Integer expiredCount;
 
+    @DbField("max(gr.expiry_time)")
+    private Date lastTicketTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -45,6 +45,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author chan
@@ -292,4 +294,15 @@ public class CmsAccountController {
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
+
+	/**
+	 * 需要修改主账号密码的平台
+	 */
+	@GetMapping("/get/expired/platform")
+	public Result<String> getExpiredPlatform() {
+		List<UserTicketClearedRecordView> userTicket = beanSearcher.searchList(UserTicketClearedRecordView.class, MapUtils.builder().field(UserTicketClearedRecordView::getDeleted, true).build());
+		Set<String> platFormSet = userTicket.stream().map(UserTicketClearedRecordView::getPlatform).collect(Collectors.toSet());
+		String platForms = platFormSet.stream().collect(Collectors.joining("、"));
+		return GatewayResponse.SUCCESS.newBuilder().toResult(platForms);
+	}
 }