fix 导出被封禁账号优化

netflix-dao/src/main/java/com/cyksj/model/entity/NetflixUserAccountStatusRecord.java

@@ -16,6 +16,10 @@ public class NetflixUserAccountStatusRecord extends BaseEntity{
 
 	private Long orderId;
 
+	private Long accountId;
+
+	private Long skuId;
+
 	private Long relationId;
 
 	private String account;

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

@@ -17,11 +17,10 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "netflix_user_account_status_record ans inner join order_don o on o.id = ans.order_id" +
-		" left join goods_don_sku sku on sku.id = o.sku_id" +
-		" left join account a on a.account = ans.account and a.goods_id = o.goods_id",
+@SearchBean(tables = "netflix_user_account_status_record ans left join goods_don_sku sku on sku.id = ans.sku_id" +
+		" left join account a on a.id = ans.account_id",
 		where = "ans.state = 3",
-		groupBy = "ans.account,o.sku_id,o.goods_id")
+		groupBy = "ans.account,ans.sku_id,sku.goods_id")
 @ExcelIgnoreUnannotated
 public class ExcelBannerNfAccountData {
 	@DbField("ans.account")
@@ -36,7 +35,7 @@ public class ExcelBannerNfAccountData {
 	@ExcelProperty("检测时间")
 	private Date createdTime;
 
-	@DbField("o.sku_id")
+	@DbField("ans.sku_id")
 	private Long skuId;
 
 	@DbField("sku.spec_val")

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

@@ -146,6 +146,10 @@ public class RenewalView {
     @DbField("gr.compensation_days")
     private Integer compensationDays;
 
+    @DbField("a.id")
+    @JsonIgnore
+    private Long accountId;
+
     @DbField("a.account")
     private String account;
 

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

@@ -1363,6 +1363,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		netflixUserAccountStatusRecord.setPassword(password);
 		netflixUserAccountStatusRecord.setUserId(renewalView.getUserId());
 		netflixUserAccountStatusRecord.setState(state);
+		netflixUserAccountStatusRecord.setAccountId(renewalView.getAccountId());
+		netflixUserAccountStatusRecord.setSkuId(renewalView.getSkuId());
 		OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 				.eq(OrderDon::getRelationId, renewalView.getRelationId())
 				.in(OrderDon::getUserId, userIdList)