修改只有核销单号的逻辑

src/main/java/cn/quantgroup/customer/repo/TransactionReceiptRecordRepo.java

@@ -39,5 +39,8 @@ public interface TransactionReceiptRecordRepo extends JpaRepository<TransactionR
     @Query(value = "select * from transaction_receipt_record where order_no = ?1 and import_status = 1 and  export_status != 1 order by id desc", nativeQuery = true)
     List<TransactionReceiptRecord> selectRecords(String orderNo);
 
+    @Query(value = "select * from transaction_receipt_record where consume_no = ?1 and import_status = 1 and  export_status != 1 order by id desc", nativeQuery = true)
+    List<TransactionReceiptRecord> selectRecordsConsumeNo(String orderNo);
+
 
 }

src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java

@@ -425,6 +425,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                     //生成pdf
                     String directory =record.getSerialNo()+record.getUserName();
                     String pdfFileName = record.getUserId()+"-"+record.getUserName()+"-"+record.getOrderNo()+".pdf";
+                    if (StringUtils.isNotEmpty(record.getConsumeNo())) {
+                        pdfFileName = record.getUserId()+"-"+record.getUserName()+"-"+record.getConsumeNo()+".pdf";
+                    }
                     FileToZip.mkdir(uploadLocalPath+directory);
                     log.info("导出文件生成pdf begin:"+pdfFileName);
                     generatePDF(transactionReceiptVOList.get(0),uploadLocalPath+"/"+directory+"/"+pdfFileName);
@@ -708,7 +711,10 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         if(!successList.isEmpty()){
             for(String orderNo :successList){
                 if(StringUtils.isNotBlank(orderNo)){
-                    List<TransactionReceiptRecord> list = transactionReceiptRecordRepo.selectRecords(orderNo);
+                    List<TransactionReceiptRecord> list = transactionReceiptRecordRepo.selectRecordsConsumeNo(orderNo);
+                    if (list.isEmpty()) {
+                        list = transactionReceiptRecordRepo.selectRecords(orderNo);
+                    }
                     if(!list.isEmpty()){
                         list.get(0).setExportStatus(VoucherExportStatus.EXPORT_SUCCESS.getCode());
                         list.get(0).setSignStatus(VoucherExportStatus.EXPORT_SUCCESS.getCode());