diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java index 4441b4639..e626511e2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java @@ -29,6 +29,12 @@ public class OrderInvoiceRecord extends BaseEntity { @Excel(name = "会员id") private String memberId; + /** + * 运营商id + */ + @Excel(name = "运营商id") + private String merchantId; + /** * 发票抬头id */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml index 9f27066d2..634324556 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml @@ -7,6 +7,7 @@ + @@ -24,7 +25,7 @@ - id, member_id, title_id, phone_number, email, order_codes, status, total_amount, total_service_amount, total_elec_amount, + id, member_id, merchant_id, title_id, phone_number, email, order_codes, status, total_amount, total_service_amount, total_elec_amount, create_by, create_time, update_by, update_time, del_flag @@ -38,6 +39,7 @@ and member_id = #{memberId} + and merchant_id = #{merchantId} and order_codes like concat('%', #{orderCodes}, '%') and status = #{status} and total_amount = #{totalAmount} @@ -56,6 +58,7 @@ insert into order_invoice_record member_id, + merchant_id, title_id, phone_number, email, @@ -72,6 +75,7 @@ #{memberId}, + #{merchantId}, #{titleId}, #{phoneNumber}, #{email}, @@ -92,6 +96,7 @@ update order_invoice_record member_id = #{memberId}, + merchant_id = #{merchantId}, order_codes = #{orderCodes}, status = #{status}, total_amount = #{totalAmount},