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

Feature/export voucher 20221102

See merge request !8

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

@@ -33,7 +33,10 @@ public class TransactionReceiptRecord {
     private Integer exportStatus = 0;
 
     @Column(name = "order_no")
-    private String orderNo;
+    private String orderNo = "";
+
+    @Column(name = "consume_no")
+    private String consumeNo = "";
 
     @Column(name = "batch_no")
     private Integer batchNo =0;

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

@@ -25,7 +25,7 @@ public interface TransactionReceiptRecordRepo extends JpaRepository<TransactionR
     @Query(value = "select * from transaction_receipt_record where order_no = ?1 and user_id =?2 and user_name =?3 and import_status != 2 and export_status = 0 ", nativeQuery = true)
     List<TransactionReceiptRecord> selectRecordsByOrderNo(String orderNo,Integer userId,String userName);
 
-    @Query(value = "select * from transaction_receipt_record where import_status = ?1 and export_status != 1 limit ?2 ", nativeQuery = true)
+    @Query(value = "select * from transaction_receipt_record where import_status = ?1 and (export_status = 0 or export_status = 2) limit ?2 ", nativeQuery = true)
     List<TransactionReceiptRecord> selectRecordsByImportStatusAndExportStatus(Integer status,Integer limit);
 
     @Query(value = "select count(1) from transaction_receipt_record where import_status =?1 ", nativeQuery = true)
@@ -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/rest/enums/VoucherExportStatus.java

+package cn.quantgroup.customer.rest.enums;
+
+public enum VoucherExportStatus {
+
+    INIT(0, "初始状态"),
+    EXPORT_SUCCESS(1, "成功"),
+    EXPORT_FAIL(2, "失败"),
+    EXPORT_WARN(3, "物流信息异常"),
+    ;
+
+    private Integer code;
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    VoucherExportStatus(Integer code, String message) {
+        this.message = message;
+        this.code = code;
+    }
+}

src/main/java/cn/quantgroup/customer/rest/vo/transaction/LoanVO.java

+package cn.quantgroup.customer.rest.vo.transaction;
+
+import lombok.Data;
+
+@Data
+public class LoanVO {
+    /**
+     * 合同号
+     */
+    private String contractNo;
+
+}

src/main/java/cn/quantgroup/customer/rest/vo/transaction/OrderVO.java

@@ -66,4 +66,19 @@ public class OrderVO {
      */
     private String payTypeName;
 
+    /**
+     *  vcc支付金额
+     */
+    private String vccPayAmount;
+
+    /**
+     * 其他方式支付金额
+     */
+    private String otherPayAmount;
+
+    /**
+     * 合同号
+     */
+    private String contractNo;
+
 }

src/main/java/cn/quantgroup/customer/rest/vo/transaction/TransactionReceiptRecordVO.java

@@ -16,6 +16,8 @@ public class TransactionReceiptRecordVO {
 
     private String tradeNo;
 
+    private String consumeNo;
+
     private Integer id;
 
 }

src/main/java/cn/quantgroup/customer/rest/vo/transaction/TransactionReceiptVO.java

@@ -22,4 +22,9 @@ public class TransactionReceiptVO {
      * 物流信息
      */
     private ReceiverVO receiver;
+
+    /**
+     * 贷款信息
+     */
+    private LoanVO loan;
 }