From e7ec957b9ee95a4fc0f28b3e8de710b7d9141ee1 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Sun, 14 Apr 2024 10:21:38 +0800
Subject: [PATCH] =?UTF-8?q?202404-=E8=B0=83=E6=95=B4=E5=87=BA=E5=9C=BA?=
 =?UTF-8?q?=E8=AF=9D=E6=9C=AF=EF=BC=8C=E7=AF=AE=E7=90=83=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sv/dto/api/MemberEnterOrderDTO.java   | 14 ++++++++++++++
 .../mybatis/mapper/sv/BarcodeOrderTimeMapper.xml   |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
index f64ee82..75f34c8 100644
--- a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
+++ b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
@@ -165,6 +165,20 @@ public class MemberEnterOrderDTO implements Serializable {
      */
     private String mobile;
 
+    /**
+     * 新增pay_style
+     * @return
+     */
+    private Integer payStyle;
+
+    public Integer getPayStyle() {
+        return payStyle;
+    }
+
+    public void setPayStyle(Integer payStyle) {
+        this.payStyle = payStyle;
+    }
+
     public Integer getId() {
         return id;
     }
diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
index c441699..39ae416 100644
--- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
@@ -289,7 +289,8 @@
         1 as payType,
         ue.address as address,
         ue.longitude,
-        ue.latitude
+        ue.latitude,
+        ue.pay_style as payStyle
 		from sv_barcode_order_time t LEFT JOIN sv_venue ue on t.venue_id = ue.id
 		where t.member_id = #{memberId,jdbcType=INTEGER}
 		and t.id = #{enterId,jdbcType=INTEGER}