fix 导出封禁账号；代充导出增加token字段

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelBannerNfAccountData.java

@@ -17,18 +17,16 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "netflix_user_account_status_record ans inner join groups_relation gr on gr.id = ans.relation_id" +
-		" inner join groups_trips gt on gt.id = gr.groups_id" +
-		" inner join account a on a.id = gt.account_id",
+@SearchBean(tables = "netflix_user_account_status_record ans inner join order_don o on o.id = ans.order_id",
 		where = "ans.state = 3",
-		groupBy = "a.account,a.password,ans.created_time,gt.sku_id")
+		groupBy = "ans.account,o.sku_id,o.goods_id")
 @ExcelIgnoreUnannotated
 public class ExcelBannerNfAccountData {
-	@DbField("a.account")
+	@DbField("ans.account")
 	@ExcelProperty("账号")
 	private String account;
 
-	@DbField("a.password")
+	@DbField("ifnull((select password from account a where a.account = ans.account and a.goods_id = o.goods_id limit 1),any_value(ans.password))")
 	@ExcelProperty("密码")
 	private String password;
 
@@ -36,6 +34,6 @@ public class ExcelBannerNfAccountData {
 	@ExcelProperty("检测时间")
 	private Date createdTime;
 
-	@DbField("gt.sku_id")
+	@DbField("o.sku_id")
 	private Long skuId;
 }

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelRechargeAccountData.java

@@ -50,6 +50,13 @@ public class ExcelRechargeAccountData {
 	@ExcelProperty("账号")
 	private String account;
 
+	/**
+	 * 代充token
+	 */
+	@DbField("gr.gpt_token")
+	@ExcelProperty("gptToken")
+	private String gptToken;
+
 	@DbField("gr.password")
 	@ExcelProperty("密码")
 	private String password;
@@ -135,12 +142,6 @@ public class ExcelRechargeAccountData {
 	@DbField("gr.gpt_task_id")
 	private String gptTaskId;
 
-	/**
-	 * 代充token
-	 */
-	@DbField("gr.gpt_token")
-	private String gptToken;
-
 	/**
 	 * 家庭组邀请链接
 	 */