fix 发票

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

@@ -21,12 +21,14 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "user_invoice_apply_record uar inner join user_invoice_order_relate uor on uor.record_id = uar.id" +
 		" left join order_don o on o.id = uor.order_id and uor.type = 1" +
-		" left join upgrade_order_don uod on uod.id = uor.order_id and uor.type = 2"
-		, groupBy = "uar.id,uar.user_id,uar.money,uar.zfb_payment,uar.head,uar.tax_no,uar.bank,uar.bank_no,uar.email,uar.status,uar.invoice_img,uar.created_time,uar.update_time")
+		" left join upgrade_order_don uod on uod.id = uor.order_id and uor.type = 2" +
+		" left join vip_order_don vod on vod.id = uor.order_id and uor.type = 3"
+		, groupBy = "uar.id,uar.user_id,uar.money,uar.zfb_payment,uar.head,uar.tax_no,uar.bank,uar.bank_no,uar.email,uar.file_name,uar.status,uar.invoice_img,uar.created_time,uar.update_time")
 @ExcelIgnoreUnannotated
 public class ExcelInvoiceData {
 
-	@DbField("group_concat(o.order_no)")
+	// 与发票列表一致，普通、增值、会员订单都参与搜索和导出。
+	@DbField("group_concat(convert(ifnull(o.order_no,ifnull(uod.order_no,vod.order_no)) using utf8mb4) collate utf8mb4_general_ci)")
 	@ExcelProperty("开票订单")
 	private String orderNoStr;
 

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

@@ -20,7 +20,7 @@ import java.util.Date;
 		" left join order_don o on o.id = uor.order_id and uor.type = 1" +
 		" left join upgrade_order_don uod on uod.id = uor.order_id and uor.type = 2" +
 		" left join vip_order_don vod on vod.id = uor.order_id and uor.type = 3"
-		, groupBy = "uar.id,uar.user_id,uar.money,uar.zfb_payment,uar.head,uar.tax_no,uar.bank,uar.bank_no,uar.email,uar.status,uar.invoice_img,uar.created_time,uar.update_time")
+		, groupBy = "uar.id,uar.user_id,uar.money,uar.zfb_payment,uar.head,uar.tax_no,uar.bank,uar.bank_no,uar.email,uar.file_name,uar.status,uar.invoice_img,uar.created_time,uar.update_time")
 public class UserInvoiceApplyRecordView {
 
 	@DbField("uar.id")
@@ -80,7 +80,8 @@ public class UserInvoiceApplyRecordView {
 	@DbField("uar.invoice_img")
 	private String invoiceImg;
 
-	@DbField("group_concat(ifnull(o.order_no,ifnull(uod.order_no,vod.order_no)))")
+	// 三类订单表的排序规则可能不同，统一后再聚合，避免订单号 LIKE 筛选报错。
+	@DbField("group_concat(convert(ifnull(o.order_no,ifnull(uod.order_no,vod.order_no)) using utf8mb4) collate utf8mb4_general_ci)")
 	private String orderNoStr;
 
     /**