修改核销单号字段

src/main/java/cn/quantgroup/customer/entity/TransactionReceiptRecord.java

@@ -35,8 +35,8 @@ public class TransactionReceiptRecord {
     @Column(name = "order_no")
     private String orderNo;
 
-    @Column(name = "order_id")
-    private String orderId;
+    @Column(name = "consume_no")
+    private String consumeNo;
 
     @Column(name = "batch_no")
     private Integer batchNo =0;

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

@@ -235,7 +235,8 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 }
                 //保存时如果有其中一项为空则默认为导入失败，其他则默认初始状态
                 if(record.getUserId() ==null || record.getUserId() ==0
-                        || StringUtils.isEmpty(record.getUserName())){
+                        || StringUtils.isEmpty(record.getUserName())
+                        || (StringUtils.isEmpty(record.getOrderNo()) && StringUtils.isEmpty(record.getConsumeNo()))){
                     record.setImportStatus(VoucherExportStatus.EXPORT_FAIL.getCode());
                     //默认导出失败
                     record.setExportStatus(VoucherExportStatus.EXPORT_FAIL.getCode());
@@ -319,7 +320,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 }else if(c == 4){
                     record.setOrderNo(cellValue);
                 } else if (c == 5) {
-                    record.setOrderId(cellValue);
+                    record.setConsumeNo(cellValue);
                 }
             }
             recordList.add(record);
@@ -356,7 +357,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         for(TransactionReceiptRecord record : transactionReceiptRecordList){
             Integer userId = record.getUserId();
             String orderNo = record.getOrderNo();
-            String orderId = record.getOrderId();
+            String consumeNo = record.getConsumeNo();
             //调用kdsp接口获取交易凭证订单信息
             String url = kdspOperationUrl + "/api/kdsp/op/fa-cui/transaction-proof/query";
             //String url = "http://kdsp-operation-test7.liangkebang.net/api/kdsp/op/fa-cui/transaction-proof/query";
@@ -371,8 +372,8 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 if (StringUtils.isNotBlank(orderNo)) {
                     param.put("orderNo", orderNo);
                 }
-                if (StringUtils.isNotBlank(orderId)) {
-                    param.put("consumeNo", orderId);
+                if (StringUtils.isNotBlank(consumeNo)) {
+                    param.put("consumeNo", consumeNo);
                 }
                 List<Map> paramList =new ArrayList<>();
                 paramList.add(param);