diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
index 13de065..906b2c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
@@ -69,7 +69,7 @@ public class ZcOrderSub extends BaseEntity
@Excel(name = "平台支付流水号")
private String transactionId;
- private Long bOrderId;
+ private String bOrderId;
public void setSuborderId(Long suborderId)
{
@@ -195,11 +195,11 @@ public class ZcOrderSub extends BaseEntity
this.transactionId = transactionId;
}
- public Long getbOrderId() {
+ public String getbOrderId() {
return bOrderId;
}
- public void setbOrderId(Long bOrderId) {
+ public void setbOrderId(String bOrderId) {
this.bOrderId = bOrderId;
}
diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
index 00b96d7..93bd9a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, remark, del_flag, create_time, update_time from zc_order_sub
+ select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, b_order_id, remark, del_flag, create_time, update_time from zc_order_sub