Merge branch 'feature/exportVoucher-20221102' into 'master'

Feature/export voucher 20221102

See merge request !9

src/main/java/cn/quantgroup/customer/rest/param/transactionreceipt/TransactionReceiptRecordQuery.java

@@ -24,6 +24,10 @@ public class TransactionReceiptRecordQuery {
      * 导出状态
      */
     private String exportStatus;
+    /**
+     * 核销单号
+     */
+    private String consumeNo;
     /**
      * 当前页数
      */

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

@@ -128,6 +128,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             if (StringUtils.isNotEmpty(query.getExportStatus())) {
                 predicates.add(criteriaBuilder.equal(root.get("exportStatus"), query.getExportStatus()));
             }
+            if (StringUtils.isNotEmpty(query.getConsumeNo())) {
+                predicates.add(criteriaBuilder.equal(root.get("consumeNo"), query.getConsumeNo()));
+            }
             // 设置查询条件
             criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
             // 指定排序
@@ -226,12 +229,12 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                     continue;
                 }
                 //查询是否存在相同单号的数据，如果存在则不能导入
-                List<TransactionReceiptRecord> records =
-                        transactionReceiptRecordRepo.selectRecordsByOrderNo(record.getOrderNo(),record.getUserId(),record.getUserName());
-                if(CollectionUtils.isNotEmpty(records)){
-                    deleteRedis("importTransactionReceiptRecord");
-                    throw new RuntimeException("存在userid为"+record.getUserId()+"，姓名为"+record.getUserName()+"，交易单号为"+record.getOrderNo()+"数据还未导出,不能再次导入");
-                }
+//                List<TransactionReceiptRecord> records =
+//                        transactionReceiptRecordRepo.selectRecordsByOrderNo(record.getOrderNo(),record.getUserId(),record.getUserName());
+//                if(CollectionUtils.isNotEmpty(records)){
+//                    deleteRedis("importTransactionReceiptRecord");
+//                    throw new RuntimeException("存在userid为"+record.getUserId()+"，姓名为"+record.getUserName()+"，交易单号为"+record.getOrderNo()+"数据还未导出,不能再次导入");
+//                }
                 //保存时如果有其中一项为空则默认为导入失败，其他则默认初始状态
                 if(record.getUserId() ==null || record.getUserId() ==0
                         || StringUtils.isEmpty(record.getUserName())